RarAes.h (p7zip_15.14.1_src_all) | : | RarAes.h (p7zip_16.02_src_all) | ||
---|---|---|---|---|
skipping to change at line 27 | skipping to change at line 27 | |||
const unsigned kAesKeySize = 16; | const unsigned kAesKeySize = 16; | |||
class CDecoder: | class CDecoder: | |||
public CAesCbcDecoder | public CAesCbcDecoder | |||
// public ICompressSetDecoderProperties2, | // public ICompressSetDecoderProperties2, | |||
// public ICryptoSetPassword | // public ICryptoSetPassword | |||
{ | { | |||
Byte _salt[8]; | Byte _salt[8]; | |||
bool _thereIsSalt; | bool _thereIsSalt; | |||
bool _needCalc; | bool _needCalc; | |||
bool _rar350Mode; | // bool _rar350Mode; | |||
CByteBuffer _password; | CByteBuffer _password; | |||
Byte _key[kAesKeySize]; | Byte _key[kAesKeySize]; | |||
Byte _iv[AES_BLOCK_SIZE]; | Byte _iv[AES_BLOCK_SIZE]; | |||
void CalcKey(); | void CalcKey(); | |||
public: | public: | |||
/* | /* | |||
MY_UNKNOWN_IMP1( | MY_UNKNOWN_IMP1( | |||
ICryptoSetPassword | ICryptoSetPassword | |||
// ICompressSetDecoderProperties2 | // ICompressSetDecoderProperties2 | |||
*/ | */ | |||
STDMETHOD(Init)(); | STDMETHOD(Init)(); | |||
void SetPassword(const Byte *data, unsigned size); | void SetPassword(const Byte *data, unsigned size); | |||
HRESULT SetDecoderProperties2(const Byte *data, UInt32 size); | HRESULT SetDecoderProperties2(const Byte *data, UInt32 size); | |||
CDecoder(); | CDecoder(); | |||
void SetRar350Mode(bool rar350Mode) { _rar350Mode = rar350Mode; } | // void SetRar350Mode(bool rar350Mode) { _rar350Mode = rar350Mode; } | |||
}; | }; | |||
}} | }} | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |