9.09 beta

1 files changed, 5 insertions, 17 deletions

diff --git a/CPP/7zip/Crypto/RarAes.h b/CPP/7zip/Crypto/RarAes.h
index 374017b8..119cc233 100755
--- a/CPP/7zip/Crypto/RarAes.h
+++ b/CPP/7zip/Crypto/RarAes.h
@@ -6,48 +6,36 @@
 #include "../../../C/Aes.h"
 
 #include "Common/Buffer.h"
-#include "Common/MyCom.h"
 
-#include "../ICoder.h"
 #include "../IPassword.h"
 
+#include "MyAes.h"
+
 namespace NCrypto {
 namespace NRar29 {
 
 const UInt32 kRarAesKeySize = 16;
 
 class CDecoder:
-  public ICompressFilter,
+  public CAesCbcDecoder,
   public ICompressSetDecoderProperties2,
-  public ICryptoSetPassword,
-  public CMyUnknownImp
+  public ICryptoSetPassword
 {
   Byte _salt[8];
   bool _thereIsSalt;
   CByteBuffer buffer;
   Byte aesKey[kRarAesKeySize];
-  Byte aesInit[AES_BLOCK_SIZE];
+  Byte _aesInit[AES_BLOCK_SIZE];
   bool _needCalculate;
-
-  CAesCbc Aes;
-
   bool _rar350Mode;
 
   void Calculate();
-
 public:
-
   MY_UNKNOWN_IMP2(
     ICryptoSetPassword,
     ICompressSetDecoderProperties2)
-
   STDMETHOD(Init)();
-
-  STDMETHOD_(UInt32, Filter)(Byte *data, UInt32 size);
-
   STDMETHOD(CryptoSetPassword)(const Byte *aData, UInt32 aSize);
-
-  // ICompressSetDecoderProperties
   STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
 
   CDecoder();