diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-06-15 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:54 +0300 |
| commit | 54490d51d5c6b0d794dcbad2d634d4c95fc25b6c (patch) | |
| tree | c3c413656432c0ef87b2841c80e42b55ad17d4e8 /CPP/7zip/Crypto/RarAes.h | |
| parent | 0713a3ab803e57401f18432148b4139e5fe6e5dd (diff) | |
15.0515.05
Diffstat (limited to 'CPP/7zip/Crypto/RarAes.h')
| -rw-r--r-- | CPP/7zip/Crypto/RarAes.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/CPP/7zip/Crypto/RarAes.h b/CPP/7zip/Crypto/RarAes.h index 9d9ee127..197a0b2d 100644 --- a/CPP/7zip/Crypto/RarAes.h +++ b/CPP/7zip/Crypto/RarAes.h @@ -18,22 +18,24 @@ const UInt32 kRarAesKeySize = 16; class CDecoder: public CAesCbcDecoder, - public ICompressSetDecoderProperties2, + // public ICompressSetDecoderProperties2, public ICryptoSetPassword { Byte _salt[8]; bool _thereIsSalt; - CByteBuffer buffer; - Byte aesKey[kRarAesKeySize]; - Byte _aesInit[AES_BLOCK_SIZE]; - bool _needCalculate; + bool _needCalc; bool _rar350Mode; + + CByteBuffer _password; + + Byte _key[kRarAesKeySize]; + Byte _iv[AES_BLOCK_SIZE]; - void Calculate(); + void CalcKey(); public: - MY_UNKNOWN_IMP2( - ICryptoSetPassword, - ICompressSetDecoderProperties2) + MY_UNKNOWN_IMP1( + ICryptoSetPassword) + // ICompressSetDecoderProperties2 STDMETHOD(Init)(); STDMETHOD(CryptoSetPassword)(const Byte *aData, UInt32 aSize); STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); |