From 8d8dae710d913f76d44907299a5643744c140758 Mon Sep 17 00:00:00 2001 From: morkt Date: Mon, 29 Feb 2016 08:33:17 +0400 Subject: [PATCH] NotTransform and XorTransform implementations moved to separate file. --- ArcFormats/Aoi/ArcBOX.cs | 2 +- ArcFormats/ArcCommon.cs | 33 ----------- ArcFormats/ArcFormats.csproj | 1 + ArcFormats/ArcIKS.cs | 38 ------------- ArcFormats/SimpleEncryption.cs | 100 +++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 72 deletions(-) create mode 100644 ArcFormats/SimpleEncryption.cs diff --git a/ArcFormats/Aoi/ArcBOX.cs b/ArcFormats/Aoi/ArcBOX.cs index 5ce414f9..fa41ed13 100644 --- a/ArcFormats/Aoi/ArcBOX.cs +++ b/ArcFormats/Aoi/ArcBOX.cs @@ -68,7 +68,7 @@ namespace GameRes.Formats.Aoi public override Stream OpenEntry (ArcFile arc, Entry entry) { var input = arc.File.CreateStream (entry.Offset, entry.Size); - return new CryptoStream (input, new X.XorTransform (0xB2), CryptoStreamMode.Read); + return new CryptoStream (input, new XorTransform (0xB2), CryptoStreamMode.Read); } } } diff --git a/ArcFormats/ArcCommon.cs b/ArcFormats/ArcCommon.cs index 562fd086..71109999 100644 --- a/ArcFormats/ArcCommon.cs +++ b/ArcFormats/ArcCommon.cs @@ -27,7 +27,6 @@ using GameRes.Utility; using System; using System.IO; using System.Linq; -using System.Security.Cryptography; namespace GameRes.Formats { @@ -391,38 +390,6 @@ namespace GameRes.Formats } } - public sealed class NotTransform : ICryptoTransform - { - private const int BlockSize = 256; - - public bool CanReuseTransform { get { return true; } } - public bool CanTransformMultipleBlocks { get { return true; } } - public int InputBlockSize { get { return BlockSize; } } - public int OutputBlockSize { get { return BlockSize; } } - - public int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, - byte[] outputBuffer, int outputOffset) - { - for (int i = 0; i < inputCount; ++i) - { - outputBuffer[outputOffset++] = (byte)~inputBuffer[inputOffset+i]; - } - return inputCount; - } - - public byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) - { - byte[] outputBuffer = new byte[inputCount]; - TransformBlock (inputBuffer, inputOffset, inputCount, outputBuffer, 0); - return outputBuffer; - } - - public void Dispose () - { - System.GC.SuppressFinalize (this); - } - } - /// /// Create stream in TGA format from the given image pixels. /// diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index 2f6b436c..2d4f87b0 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -68,6 +68,7 @@ + diff --git a/ArcFormats/ArcIKS.cs b/ArcFormats/ArcIKS.cs index 858346f7..dc5b5fc5 100644 --- a/ArcFormats/ArcIKS.cs +++ b/ArcFormats/ArcIKS.cs @@ -83,42 +83,4 @@ namespace GameRes.Formats.X return new CryptoStream (input, new XorTransform (key), CryptoStreamMode.Read); } } - - public sealed class XorTransform : ICryptoTransform - { - private const int BlockSize = 256; - private byte m_key; - - public bool CanReuseTransform { get { return true; } } - public bool CanTransformMultipleBlocks { get { return true; } } - public int InputBlockSize { get { return BlockSize; } } - public int OutputBlockSize { get { return BlockSize; } } - - public XorTransform (byte key) - { - m_key = key; - } - - public int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, - byte[] outputBuffer, int outputOffset) - { - for (int i = 0; i < inputCount; ++i) - { - outputBuffer[outputOffset++] = (byte)(m_key ^ inputBuffer[inputOffset+i]); - } - return inputCount; - } - - public byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) - { - byte[] outputBuffer = new byte[inputCount]; - TransformBlock (inputBuffer, inputOffset, inputCount, outputBuffer, 0); - return outputBuffer; - } - - public void Dispose () - { - System.GC.SuppressFinalize (this); - } - } } diff --git a/ArcFormats/SimpleEncryption.cs b/ArcFormats/SimpleEncryption.cs new file mode 100644 index 00000000..f55ab87a --- /dev/null +++ b/ArcFormats/SimpleEncryption.cs @@ -0,0 +1,100 @@ +//! \file SimpleEncryption.cs +//! \date Mon Feb 29 08:19:07 2016 +//! \brief Primitive encryption methods implementations. +// +// Copyright (C) 2016 by morkt +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +// + +using System.IO; +using System.Security.Cryptography; + +namespace GameRes.Formats +{ + public sealed class NotTransform : ICryptoTransform + { + private const int BlockSize = 256; + + public bool CanReuseTransform { get { return true; } } + public bool CanTransformMultipleBlocks { get { return true; } } + public int InputBlockSize { get { return BlockSize; } } + public int OutputBlockSize { get { return BlockSize; } } + + public int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, + byte[] outputBuffer, int outputOffset) + { + for (int i = 0; i < inputCount; ++i) + { + outputBuffer[outputOffset++] = (byte)~inputBuffer[inputOffset+i]; + } + return inputCount; + } + + public byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) + { + byte[] outputBuffer = new byte[inputCount]; + TransformBlock (inputBuffer, inputOffset, inputCount, outputBuffer, 0); + return outputBuffer; + } + + public void Dispose () + { + System.GC.SuppressFinalize (this); + } + } + + public sealed class XorTransform : ICryptoTransform + { + private const int BlockSize = 256; + private byte m_key; + + public bool CanReuseTransform { get { return true; } } + public bool CanTransformMultipleBlocks { get { return true; } } + public int InputBlockSize { get { return BlockSize; } } + public int OutputBlockSize { get { return BlockSize; } } + + public XorTransform (byte key) + { + m_key = key; + } + + public int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, + byte[] outputBuffer, int outputOffset) + { + for (int i = 0; i < inputCount; ++i) + { + outputBuffer[outputOffset++] = (byte)(m_key ^ inputBuffer[inputOffset+i]); + } + return inputCount; + } + + public byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) + { + byte[] outputBuffer = new byte[inputCount]; + TransformBlock (inputBuffer, inputOffset, inputCount, outputBuffer, 0); + return outputBuffer; + } + + public void Dispose () + { + System.GC.SuppressFinalize (this); + } + } +}