mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-14 16:11:38 -06:00
4.20
This commit is contained in:
Igor Pavlov
committed by
Kornel Lesiński
Kornel Lesiński
parent
8c1b5c7b7e
commit
3c510ba80b
@@ -1,4 +1,4 @@
|
||||
// Crypto/Rar20/Encoder.h
|
||||
// Crypto/AES/MyAES.cpp
|
||||
|
||||
#include "StdAfx.h"
|
||||
|
||||
@@ -6,193 +6,70 @@
|
||||
|
||||
#include "MyAES.h"
|
||||
#include "Windows/Defs.h"
|
||||
#include "Common/Defs.h"
|
||||
|
||||
#include "AES_CBC.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#include "aesopt.h"
|
||||
static const int kAESBlockSize = 16;
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#include "aesopt.h"
|
||||
}
|
||||
|
||||
class CTabInit
|
||||
{
|
||||
public:
|
||||
CTabInit()
|
||||
{
|
||||
gen_tabs();
|
||||
}
|
||||
CTabInit() { gen_tabs();}
|
||||
} g_TabInit;
|
||||
|
||||
const int kBlockSize = 16;
|
||||
|
||||
static HRESULT Encode(
|
||||
CInBuffer &inBuffer,
|
||||
COutBuffer &outBuffer,
|
||||
ISequentialInStream **inStreams,
|
||||
const UINT64 **inSizes,
|
||||
UINT32 numInStreams,
|
||||
ISequentialOutStream **outStreams,
|
||||
const UINT64 **outSizes,
|
||||
UINT32 numOutStreams,
|
||||
ICompressProgressInfo *progress,
|
||||
UINT32 keySize)
|
||||
STDMETHODIMP CAESFilter::Init()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (numInStreams != 3 || numOutStreams != 1)
|
||||
return E_INVALIDARG;
|
||||
|
||||
BYTE key[32];
|
||||
BYTE iv[kBlockSize];
|
||||
|
||||
/*
|
||||
int i;
|
||||
for (i = 0; i < kBlockSize; i++)
|
||||
iv[i] = 1;
|
||||
for (i = 0; i < keySize; i++)
|
||||
key[i] = 2;
|
||||
|
||||
RINOK(outStreams[1]->Write(iv, kBlockSize, NULL));
|
||||
RINOK(outStreams[2]->Write(key, keySize, NULL));
|
||||
*/
|
||||
UINT32 processedSize;
|
||||
RINOK(inStreams[1]->Read(iv, kBlockSize, &processedSize));
|
||||
if (processedSize != kBlockSize)
|
||||
return E_FAIL;
|
||||
|
||||
RINOK(inStreams[2]->Read(key, keySize, &processedSize));
|
||||
if (processedSize != keySize)
|
||||
return E_FAIL;
|
||||
|
||||
CAES_CBCEncoder encoder;
|
||||
encoder.enc_key(key, keySize);
|
||||
encoder.Init(iv);
|
||||
|
||||
inBuffer.Init(inStreams[0]);
|
||||
outBuffer.Init(outStreams[0]);
|
||||
|
||||
UINT64 nowPos = 0, posPrev = 0;
|
||||
while(true)
|
||||
{
|
||||
BYTE inBlock[kBlockSize], outBlock[kBlockSize];
|
||||
UINT32 numBytes;
|
||||
inBuffer.ReadBytes(inBlock, kBlockSize, numBytes);
|
||||
for (int i = numBytes; i < kBlockSize; i++)
|
||||
inBlock[i] = 0;
|
||||
encoder.ProcessData(outBlock, inBlock);
|
||||
outBuffer.WriteBytes(outBlock, kBlockSize);
|
||||
|
||||
nowPos += numBytes;
|
||||
if (progress != NULL && (nowPos - posPrev) > (1 << 18))
|
||||
{
|
||||
UINT64 outSize = nowPos - numBytes + kBlockSize;
|
||||
RINOK(progress->SetRatioInfo(&nowPos, &outSize));
|
||||
posPrev = nowPos;
|
||||
}
|
||||
if (numBytes < kBlockSize)
|
||||
break;
|
||||
}
|
||||
return outBuffer.Flush();
|
||||
// inBuffer.ReleaseStream();
|
||||
// outBuffer.ReleaseStream();
|
||||
// return S_OK;
|
||||
}
|
||||
catch(const CInBufferException &e) { return e.ErrorCode; }
|
||||
catch(const COutBufferException &e) { return e.ErrorCode; }
|
||||
catch(...) { return E_FAIL; }
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT Decode(
|
||||
CInBuffer &inBuffer,
|
||||
COutBuffer &outBuffer,
|
||||
ISequentialInStream **inStreams,
|
||||
const UINT64 **inSizes,
|
||||
UINT32 numInStreams,
|
||||
ISequentialOutStream **outStreams,
|
||||
const UINT64 **outSizes,
|
||||
UINT32 numOutStreams,
|
||||
ICompressProgressInfo *progress,
|
||||
UINT32 keySize)
|
||||
STDMETHODIMP_(UInt32) CAESFilter::Filter(Byte *data, UInt32 size)
|
||||
{
|
||||
try
|
||||
if (size > 0 && size < kAESBlockSize)
|
||||
return kAESBlockSize;
|
||||
UInt32 i;
|
||||
for (i = 0; i + kAESBlockSize <= size; i += kAESBlockSize)
|
||||
{
|
||||
if (numInStreams != 3 || numOutStreams != 1)
|
||||
return E_INVALIDARG;
|
||||
BYTE key[32];
|
||||
BYTE iv[kBlockSize];
|
||||
UINT32 processedSize;
|
||||
RINOK(inStreams[1]->Read(iv, kBlockSize, &processedSize));
|
||||
if (processedSize != kBlockSize)
|
||||
return E_FAIL;
|
||||
|
||||
RINOK(inStreams[2]->Read(key, keySize, &processedSize));
|
||||
if (processedSize != keySize)
|
||||
return E_FAIL;
|
||||
|
||||
CAES_CBCCBCDecoder decoder;
|
||||
decoder.dec_key(key, keySize);
|
||||
decoder.Init(iv);
|
||||
|
||||
inBuffer.Init(inStreams[0]);
|
||||
outBuffer.Init(outStreams[0]);
|
||||
|
||||
const UINT64 *outSize = outSizes[0];
|
||||
UINT64 nowPos = 0;
|
||||
UINT64 posPrev = 0;
|
||||
while(true)
|
||||
{
|
||||
BYTE inBlock[kBlockSize], outBlock[kBlockSize];
|
||||
UINT32 numBytes;
|
||||
inBuffer.ReadBytes(inBlock, kBlockSize, numBytes);
|
||||
if (numBytes == 0)
|
||||
break;
|
||||
decoder.ProcessData(outBlock, inBlock);
|
||||
UINT32 numBytesToWrite = kBlockSize;
|
||||
if (outSize != 0)
|
||||
numBytesToWrite = (UINT32)MyMin((*outSize - nowPos), UINT64(numBytesToWrite));
|
||||
outBuffer.WriteBytes(outBlock, numBytesToWrite);
|
||||
nowPos += numBytesToWrite;
|
||||
|
||||
if (progress != NULL && (nowPos - posPrev) > (1 << 18))
|
||||
{
|
||||
UINT64 inSize = inBuffer.GetProcessedSize();
|
||||
RINOK(progress->SetRatioInfo(&inSize, &nowPos));
|
||||
posPrev = nowPos;
|
||||
}
|
||||
|
||||
if (outSize != 0)
|
||||
if (nowPos >= *outSize)
|
||||
break;
|
||||
}
|
||||
return outBuffer.Flush();
|
||||
// inBuffer.ReleaseStream();
|
||||
// outBuffer.ReleaseStream();
|
||||
// return S_OK;
|
||||
Byte outBlock[kAESBlockSize];
|
||||
SubFilter(data + i, outBlock);
|
||||
for (int j = 0; j < kAESBlockSize; j++)
|
||||
data[i + j] = outBlock[j];
|
||||
}
|
||||
catch(const CInBufferException &e) { return e.ErrorCode; }
|
||||
catch(const COutBufferException &e) { return e.ErrorCode; }
|
||||
catch(...) { return E_FAIL; }
|
||||
return i;
|
||||
}
|
||||
|
||||
|
||||
#define MyClassCryptoImp(Name, keySize) \
|
||||
STDMETHODIMP C ## Name ## _Encoder::Code( \
|
||||
ISequentialInStream **inStreams, const UINT64 **inSizes, UINT32 numInStreams, \
|
||||
ISequentialOutStream **outStreams, const UINT64 **outSizes, UINT32 numOutStreams, \
|
||||
ICompressProgressInfo *progress) \
|
||||
{ \
|
||||
return Encode(_inByte, _outByte, inStreams, inSizes, numInStreams, \
|
||||
outStreams, outSizes, numOutStreams, progress, keySize); \
|
||||
} \
|
||||
STDMETHODIMP C ## Name ## _Decoder::Code( \
|
||||
ISequentialInStream **inStreams, const UINT64 **inSizes, UINT32 numInStreams, \
|
||||
ISequentialOutStream **outStreams, const UINT64 **outSizes, UINT32 numOutStreams, \
|
||||
ICompressProgressInfo *progress) \
|
||||
{ \
|
||||
return Decode(_inByte, _outByte, inStreams, inSizes, numInStreams, \
|
||||
outStreams, outSizes, numOutStreams, progress, keySize); \
|
||||
STDMETHODIMP CAESFilter::SetInitVector(const Byte *data, UInt32 size)
|
||||
{
|
||||
if (size != 16)
|
||||
return E_INVALIDARG;
|
||||
AES.Init(data);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
MyClassCryptoImp(AES128_CBC, 16)
|
||||
MyClassCryptoImp(AES256_CBC, 32)
|
||||
STDMETHODIMP CAESEncoder::SetKey(const Byte *data, UInt32 size)
|
||||
{
|
||||
if (AES.enc_key(data, size) != aes_good)
|
||||
return E_FAIL;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
void CAESEncoder::SubFilter(const Byte *inBlock, Byte *outBlock)
|
||||
{
|
||||
AES.Encode(inBlock, outBlock);
|
||||
}
|
||||
|
||||
STDMETHODIMP CAESDecoder::SetKey(const Byte *data, UInt32 size)
|
||||
{
|
||||
if (AES.dec_key(data, size) != aes_good)
|
||||
return E_FAIL;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
void CAESDecoder::SubFilter(const Byte *inBlock, Byte *outBlock)
|
||||
{
|
||||
AES.Decode(inBlock, outBlock);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user