diff options
Diffstat (limited to 'CPP/7zip/Crypto/7zAES/7zAES.h')
-rwxr-xr-x | CPP/7zip/Crypto/7zAES/7zAES.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/CPP/7zip/Crypto/7zAES/7zAES.h b/CPP/7zip/Crypto/7zAES/7zAES.h index e8cedccf..ce14e2a1 100755 --- a/CPP/7zip/Crypto/7zAES/7zAES.h +++ b/CPP/7zip/Crypto/7zAES/7zAES.h @@ -6,7 +6,7 @@ #include "Common/MyCom.h" #include "Common/Types.h" #include "Common/Buffer.h" -#include "Common/Vector.h" +#include "Common/MyVector.h" #include "../../ICoder.h" #include "../../IPassword.h" @@ -55,7 +55,7 @@ class CBase protected: CKeyInfo _key; Byte _iv[16]; - // int _ivSize; + UInt32 _ivSize; void CalculateDigest(); CBase(); }; @@ -80,17 +80,26 @@ public: STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size); }; +#ifndef EXTRACT_ONLY + class CEncoder: public CBaseCoder, - public ICompressWriteCoderProperties + public ICompressWriteCoderProperties, + // public ICryptoResetSalt, + public ICryptoResetInitVector { virtual HRESULT CreateFilter(); public: - MY_UNKNOWN_IMP2( + MY_UNKNOWN_IMP3( ICryptoSetPassword, - ICompressWriteCoderProperties) + ICompressWriteCoderProperties, + // ICryptoResetSalt, + ICryptoResetInitVector) STDMETHOD(WriteCoderProperties)(ISequentialOutStream *outStream); + // STDMETHOD(ResetSalt)(); + STDMETHOD(ResetInitVector)(); }; +#endif class CDecoder: public CBaseCoder, |