diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2007-07-24 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:15:52 +0300 |
commit | 980e181dcc9d64312a4dddfa58f80770506f27f5 (patch) | |
tree | 4ab20c1b4c7ebfe0f5fbf39ec2ce2cd3022ebf66 /CPP/7zip/Crypto/WzAES/WzAES.h | |
parent | 7038848692e7049234f223703522681a19db49a5 (diff) |
4.50 beta
Diffstat (limited to 'CPP/7zip/Crypto/WzAES/WzAES.h')
-rwxr-xr-x | CPP/7zip/Crypto/WzAES/WzAES.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/CPP/7zip/Crypto/WzAES/WzAES.h b/CPP/7zip/Crypto/WzAES/WzAES.h index 10df3045..72a493a1 100755 --- a/CPP/7zip/Crypto/WzAES/WzAES.h +++ b/CPP/7zip/Crypto/WzAES/WzAES.h @@ -21,10 +21,14 @@ specified in password Based File Encryption Utility: #include "../../ICoder.h" #include "../../IPassword.h" +extern "C" +{ +#include "../../../../C/Crypto/Aes.h" +} + namespace NCrypto { namespace NWzAES { -const unsigned int kAesBlockSize = 16; const unsigned int kSaltSizeMax = 16; const unsigned int kMacSize = 10; @@ -56,17 +60,16 @@ class CBaseCoder: { protected: CKeyInfo _key; - Byte _counter[8]; - Byte _buffer[kAesBlockSize]; + UInt32 _counter[AES_BLOCK_SIZE / 4]; + Byte _buffer[AES_BLOCK_SIZE]; NSha1::CHmac _hmac; unsigned int _blockPos; Byte _pwdVerifFromArchive[kPwdVerifCodeSize]; void EncryptData(Byte *data, UInt32 size); - CMyComPtr<ICompressFilter> _aesFilter; + CAes Aes; - HRESULT CreateFilters(); public: STDMETHOD(Init)(); STDMETHOD_(UInt32, Filter)(Byte *data, UInt32 size) = 0; |