xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-15 06:11:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

23.01

Browse Source
This commit is contained in:
Igor Pavlov
2023-12-22 17:17:05 +00:00
committed by Kornel
parent ec44a8a070
commit a36c48cece
954 changed files with 42199 additions and 25482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
CPP/7zip/Crypto/ZipStrong.h
View File

@@ -1,7 +1,7 @@
// Crypto/ZipStrong.h
#ifndef __CRYPTO_ZIP_STRONG_H
#define __CRYPTO_ZIP_STRONG_H
#ifndef ZIP7_INC_CRYPTO_ZIP_STRONG_H
#define ZIP7_INC_CRYPTO_ZIP_STRONG_H
#include "../../Common/MyBuffer2.h"
@@ -28,34 +28,29 @@ struct CKeyInfo
void SetPassword(const Byte *data, UInt32 size);
~CKeyInfo() { Wipe(); }
void Wipe()
{
MY_memset_0_ARRAY(MasterKey);
Z7_memset_0_ARRAY(MasterKey);
}
};
class CBaseCoder:
public CAesCbcDecoder,
public ICryptoSetPassword
{
protected:
CKeyInfo _key;
CAlignedBuffer _bufAligned;
public:
STDMETHOD(Init)();
STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size);
};
const unsigned kAesPadAllign = AES_BLOCK_SIZE;
class CDecoder: public CBaseCoder
{
Z7_CLASS_IMP_COM_2(
CDecoder
, ICompressFilter
, ICryptoSetPassword
)
CAesCbcDecoder *_cbcDecoder;
CMyComPtr<ICompressFilter> _aesFilter;
CKeyInfo _key;
CAlignedBuffer _bufAligned;
UInt32 _ivSize;
Byte _iv[16];
UInt32 _remSize;
public:
MY_UNKNOWN_IMP1(ICryptoSetPassword)
HRESULT ReadHeader(ISequentialInStream *inStream, UInt32 crc, UInt64 unpackSize);
HRESULT Init_and_CheckPassword(bool &passwOK);
UInt32 GetPadSize(UInt32 packSize32) const
@@ -64,11 +59,12 @@ public:
// Change it, if is not AES
return kAesPadAllign - (packSize32 & (kAesPadAllign - 1));
}
CDecoder();
~CDecoder() { Wipe(); }
void Wipe()
{
MY_memset_0_ARRAY(_iv);
Z7_memset_0_ARRAY(_iv);
_key.Wipe();
}
};