4.45 beta

CPP/7zip/Crypto/WzAES/WzAES.cpp

@@ -14,11 +14,7 @@ specified in password Based File Encryption Utility.
 
 #include "WzAES.h"
 
-#ifdef CRYPTO_AES
 #include "../AES/MyAES.h"
-#else
-extern void GetCryptoFolderPrefix(TCHAR *path);
-#endif
 
 // define it if you don't want to use speed-optimized version of Pbkdf2HmacSha1
 // #define _NO_WZAES_OPTIMIZATIONS
@@ -226,20 +222,7 @@ STDMETHODIMP_(UInt32) CDecoder::Filter(Byte *data, UInt32 size)
 HRESULT CBaseCoder::CreateFilters()
 {
   if (!_aesFilter)
-  {
-    #ifdef CRYPTO_AES
-
     _aesFilter = new CAES_ECB_Encoder;
-    
-    #else
-    
-    TCHAR aesLibPath[MAX_PATH + 64];
-    GetCryptoFolderPrefix(aesLibPath);
-    lstrcat(aesLibPath, TEXT("AES.dll"));
-    RINOK(_aesLibrary.LoadAndCreateFilter(aesLibPath, CLSID_CCrypto_AES_ECB_Encoder, &_aesFilter));
-    
-    #endif
-  }
   return S_OK;
 }
 

CPP/7zip/Crypto/WzAES/WzAES.h

@@ -21,13 +21,6 @@ specified in password Based File Encryption Utility:
 #include "../../ICoder.h"
 #include "../../IPassword.h"
 
-#ifndef CRYPTO_AES
-#include "../../Archive/Common/CoderLoader.h"
-#endif
-
-DEFINE_GUID(CLSID_CCrypto_AES_ECB_Encoder, 
-0x23170F69, 0x40C1, 0x278B, 0x06, 0x01, 0xC0, 0x00, 0x00, 0x00, 0x01, 0x00);
-
 namespace NCrypto {
 namespace NWzAES {
 
@@ -71,9 +64,6 @@ protected:
 
   void EncryptData(Byte *data, UInt32 size);
 
-  #ifndef CRYPTO_AES
-  CCoderLibrary _aesLibrary;
-  #endif
   CMyComPtr<ICompressFilter> _aesFilter;
 
   HRESULT CreateFilters();