16.00

CPP/7zip/Crypto/7zAes.h

@@ -86,7 +86,8 @@ class CEncoder:
   public ICryptoResetInitVector
 {
 public:
-  MY_UNKNOWN_IMP3(
+  MY_UNKNOWN_IMP4(
+      ICompressFilter,
       ICryptoSetPassword,
       ICompressWriteCoderProperties,
       // ICryptoResetSalt,
@@ -104,7 +105,8 @@ class CDecoder:
   public ICompressSetDecoderProperties2
 {
 public:
-  MY_UNKNOWN_IMP2(
+  MY_UNKNOWN_IMP3(
+      ICompressFilter,
       ICryptoSetPassword,
       ICompressSetDecoderProperties2)
   STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);

CPP/7zip/Crypto/7zAesRegister.cpp

@@ -6,7 +6,12 @@
 
 #include "7zAes.h"
 
+namespace NCrypto {
+namespace N7z {
+
 REGISTER_FILTER_E(7zAES,
-    NCrypto::N7z::CDecoder(),
-    NCrypto::N7z::CEncoder(),
+    CDecoder(),
+    CEncoder(),
     0x6F10701, "7zAES")
+
+}}

CPP/7zip/Crypto/MyAes.h

@@ -30,7 +30,7 @@ class CAesCbcCoder:
 public:
   CAesCbcCoder(bool encodeMode, unsigned keySize);
   
-  MY_UNKNOWN_IMP2(ICryptoProperties, ICompressSetCoderProperties)
+  MY_UNKNOWN_IMP3(ICompressFilter, ICryptoProperties, ICompressSetCoderProperties)
   
   INTERFACE_ICompressFilter(;)
   

CPP/7zip/Crypto/MyAesReg.cpp

@@ -6,7 +6,11 @@
 
 #include "MyAes.h"
 
+namespace NCrypto {
+
 REGISTER_FILTER_E(AES256CBC,
-    NCrypto::CAesCbcDecoder(32),
-    NCrypto::CAesCbcEncoder(32),
+    CAesCbcDecoder(32),
+    CAesCbcEncoder(32),
     0x6F00181, "AES256CBC")
+
+}