mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-14 04:11:37 -06:00
4.20
This commit is contained in:
committed by
Kornel Lesiński
parent
8c1b5c7b7e
commit
3c510ba80b
@@ -8,111 +8,97 @@
|
||||
namespace NCrypto {
|
||||
namespace NZip {
|
||||
|
||||
/*
|
||||
const int kBufferSize = 1 << 17;
|
||||
|
||||
CBuffer2::CBuffer2():
|
||||
_buffer(0)
|
||||
{
|
||||
_buffer = new BYTE[kBufferSize];
|
||||
_buffer = new Byte[kBufferSize];
|
||||
}
|
||||
|
||||
CBuffer2::~CBuffer2()
|
||||
{
|
||||
delete []_buffer;
|
||||
}
|
||||
*/
|
||||
|
||||
STDMETHODIMP CEncoder::CryptoSetPassword(const BYTE *data, UINT32 size)
|
||||
STDMETHODIMP CEncoder::CryptoSetPassword(const Byte *data, UInt32 size)
|
||||
{
|
||||
_cipher.SetPassword(data, size);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP CEncoder::CryptoSetCRC(UINT32 crc)
|
||||
STDMETHODIMP CEncoder::CryptoSetCRC(UInt32 crc)
|
||||
{
|
||||
_crc = crc;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
|
||||
ISequentialOutStream *outStream, const UINT64 *inSize, const UINT64 *outSize,
|
||||
ICompressProgressInfo *progress)
|
||||
STDMETHODIMP CEncoder::Init()
|
||||
{
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT CEncoder::WriteHeader(ISequentialOutStream *outStream)
|
||||
{
|
||||
CRandom random;
|
||||
random.Init(::GetTickCount());
|
||||
|
||||
UINT64 nowPos = 0;
|
||||
BYTE header[kHeaderSize];
|
||||
UInt64 nowPos = 0;
|
||||
Byte header[kHeaderSize];
|
||||
for (int i = 0; i < kHeaderSize - 2; i++)
|
||||
{
|
||||
header[i] = BYTE(random.Generate());
|
||||
header[i] = Byte(random.Generate());
|
||||
}
|
||||
header[kHeaderSize - 1] = BYTE(_crc >> 24);
|
||||
header[kHeaderSize - 2] = BYTE(_crc >> 16);
|
||||
header[kHeaderSize - 1] = Byte(_crc >> 24);
|
||||
header[kHeaderSize - 2] = Byte(_crc >> 16);
|
||||
|
||||
UINT32 processedSize;
|
||||
UInt32 processedSize;
|
||||
_cipher.EncryptHeader(header);
|
||||
RINOK(outStream->Write(header, kHeaderSize, &processedSize));
|
||||
if (processedSize != kHeaderSize)
|
||||
return E_FAIL;
|
||||
|
||||
while(true)
|
||||
{
|
||||
if (outSize != NULL && nowPos == *outSize)
|
||||
return S_OK;
|
||||
RINOK(inStream->Read(_buffer, kBufferSize, &processedSize));
|
||||
if (processedSize == 0)
|
||||
return S_OK;
|
||||
for (UINT32 i = 0; i < processedSize; i++)
|
||||
_buffer[i] = _cipher.EncryptByte(_buffer[i]);
|
||||
UINT32 size = processedSize;
|
||||
if (outSize != NULL && nowPos + size > *outSize)
|
||||
size = UINT32(*outSize - nowPos);
|
||||
RINOK(outStream->Write(_buffer, size, &processedSize));
|
||||
if (size != processedSize)
|
||||
return E_FAIL;
|
||||
nowPos += processedSize;
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP CDecoder::CryptoSetPassword(const BYTE *data, UINT32 size)
|
||||
STDMETHODIMP_(UInt32) CEncoder::Filter(Byte *data, UInt32 size)
|
||||
{
|
||||
UInt32 i;
|
||||
for (i = 0; i < size; i++)
|
||||
data[i] = _cipher.EncryptByte(data[i]);
|
||||
return i;
|
||||
}
|
||||
|
||||
STDMETHODIMP CDecoder::CryptoSetPassword(const Byte *data, UInt32 size)
|
||||
{
|
||||
_cipher.SetPassword(data, size);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream,
|
||||
ISequentialOutStream *outStream, const UINT64 *inSize, const UINT64 *outSize,
|
||||
ICompressProgressInfo *progress)
|
||||
HRESULT CDecoder::ReadHeader(ISequentialInStream *inStream)
|
||||
{
|
||||
UINT64 nowPos = 0;
|
||||
|
||||
if (inSize != NULL && *inSize == 0)
|
||||
return S_OK;
|
||||
|
||||
BYTE header[kHeaderSize];
|
||||
UINT32 processedSize;
|
||||
UInt64 nowPos = 0;
|
||||
Byte header[kHeaderSize];
|
||||
UInt32 processedSize;
|
||||
RINOK(inStream->Read(header, kHeaderSize, &processedSize));
|
||||
if (processedSize != kHeaderSize)
|
||||
return E_FAIL;
|
||||
_cipher.DecryptHeader(header);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
while(true)
|
||||
{
|
||||
if (outSize != NULL && nowPos == *outSize)
|
||||
return S_OK;
|
||||
RINOK(inStream->Read(_buffer, kBufferSize, &processedSize));
|
||||
if (processedSize == 0)
|
||||
return S_OK;
|
||||
for (UINT32 i = 0; i < processedSize; i++)
|
||||
_buffer[i] = _cipher.DecryptByte(_buffer[i]);
|
||||
UINT32 size = processedSize;
|
||||
if (outSize != NULL && nowPos + size > *outSize)
|
||||
size = UINT32(*outSize - nowPos);
|
||||
RINOK(outStream->Write(_buffer, size, &processedSize));
|
||||
if (size != processedSize)
|
||||
return E_FAIL;
|
||||
nowPos += processedSize;
|
||||
}
|
||||
STDMETHODIMP CDecoder::Init()
|
||||
{
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP_(UInt32) CDecoder::Filter(Byte *data, UInt32 size)
|
||||
{
|
||||
UInt32 i;
|
||||
for (i = 0; i < size; i++)
|
||||
data[i] = _cipher.DecryptByte(data[i]);
|
||||
return i;
|
||||
}
|
||||
|
||||
}}
|
||||
|
||||
Reference in New Issue
Block a user