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);