4.50 beta

12 files changed, 132 insertions, 278 deletions

diff --git a/CPP/7zip/Bundles/Alone/Alone.dsp b/CPP/7zip/Bundles/Alone/Alone.dsp
index 6250c0bd..49a7f037 100755
--- a/CPP/7zip/Bundles/Alone/Alone.dsp
+++ b/CPP/7zip/Bundles/Alone/Alone.dsp
@@ -2067,97 +2067,6 @@ SOURCE=..\..\Crypto\Zip\ZipCrypto.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Crypto\AES\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\AES_CBC.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescpp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescrypt.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aeskey.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aesopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aestab.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Crypto\AES\MyAES.cpp
 
 !IF  "$(CFG)" == "Alone - Win32 Release"
@@ -2460,6 +2369,38 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
 # End Source File
 # End Group
 # End Group
+# Begin Group "C-Crypto"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.c
+
+!IF  "$(CFG)" == "Alone - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\..\..\C\7zCrc.c
diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile
index ee881a01..de5f7e3f 100755
--- a/CPP/7zip/Bundles/Alone/makefile
+++ b/CPP/7zip/Bundles/Alone/makefile
@@ -250,11 +250,6 @@ COMPRESS_Z_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\HmacSha1.obj \
   $O\Pbkdf2HmacSha1.obj \
@@ -286,6 +281,9 @@ C_BRANCH_OBJS = \
   $O\BranchSPARC.obj \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -327,11 +325,11 @@ OBJS = \
   $O\RangeCoderBit.obj \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $(CRYPTO_HASH_OBJS) \
   $(CRYPTO_ZIP_OBJS) \
   $(CRYPTO_WZAES_OBJS) \
   $O\QuantumDecoder.obj \
+  $(C_CRYPTO) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -408,8 +406,6 @@ $O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp
 
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL_O2)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O2_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL_O2)
 $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
@@ -427,4 +423,6 @@ $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
 	$(COMPL_O2)
 $O\HuffmanEncode.obj: ../../../../C/Compress/Huffman/$(*B).c
 	$(COMPL_O2)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O2)
 !include "../../Crc.mak"
\ No newline at end of file
diff --git a/CPP/7zip/Bundles/Format7z/makefile b/CPP/7zip/Bundles/Format7z/makefile
index e690dd3a..04bad9fd 100755
--- a/CPP/7zip/Bundles/Format7z/makefile
+++ b/CPP/7zip/Bundles/Format7z/makefile
@@ -132,11 +132,6 @@ PPMD_OPT_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\RandGen.obj \
   $O\Sha1.obj \
@@ -158,6 +153,9 @@ C_BRANCH_OBJS = \
   $O\BranchSPARC.obj \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -185,8 +183,8 @@ OBJS = \
   $O\RangeCoderBit.obj \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $(CRYPTO_HASH_OBJS) \
+  $(C_CRYPTO) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -233,8 +231,6 @@ $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
 
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL_O2)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O2_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL_O2)
 $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
@@ -246,5 +242,7 @@ $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
 	$(COMPL_O2)
 $(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
 	$(COMPL_O2)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O2)
 
 !include "../../Crc.mak"
diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile
index a2362869..10bec119 100755
--- a/CPP/7zip/Bundles/Format7zExtract/makefile
+++ b/CPP/7zip/Bundles/Format7zExtract/makefile
@@ -118,11 +118,6 @@ PPMD_OPT_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\Sha256.obj \
 
@@ -138,6 +133,9 @@ C_BRANCH_OBJS = \
   $O\BranchSPARC.obj \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -161,10 +159,10 @@ OBJS = \
   $(PPMD_OPT_OBJS) \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $(CRYPTO_HASH_OBJS) \
   $(C_OBJS) \
   $(C_BRANCH_OBJS) \
+  $(C_CRYPTO) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -208,8 +206,6 @@ $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
 
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL_O2)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O2_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL_O2)
 $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
@@ -218,5 +214,7 @@ $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
 $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
 	$(COMPL_O2)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O2)
 
 !include "../../Crc.mak"
diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
index 0f8407cc..66dfd29b 100755
--- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp
+++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
@@ -841,70 +841,6 @@ SOURCE=..\..\Compress\Lzh\LzhDecoder.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Crypto\AES\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\AES_CBC.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescpp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescrypt.c
-
-!IF  "$(CFG)" == "7z - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aeskey.c
-
-!IF  "$(CFG)" == "7z - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aesopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aestab.c
-
-!IF  "$(CFG)" == "7z - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Crypto\AES\MyAES.cpp
 
 !IF  "$(CFG)" == "7z - Win32 Release"
@@ -1110,6 +1046,10 @@ SOURCE=..\..\Crypto\Zip\ZipCrypto.cpp
 SOURCE=..\..\Crypto\Zip\ZipCrypto.h
 # End Source File
 # End Group
+# Begin Group "ZipStrong"
+
+# PROP Default_Filter ""
+# End Group
 # End Group
 # Begin Group "7zip Common"
 
@@ -1479,6 +1419,30 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
 # End Source File
 # End Group
 # End Group
+# Begin Group "Crypto-C"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.c
+
+!IF  "$(CFG)" == "7z - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\..\..\C\7zCrc.c
@@ -1510,6 +1474,10 @@ SOURCE=..\..\..\..\C\Alloc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\CpuArch.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\IStream.h
 # End Source File
 # Begin Source File
diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile
index 0f3bf3d1..00e3e43d 100755
--- a/CPP/7zip/Bundles/Format7zF/makefile
+++ b/CPP/7zip/Bundles/Format7zF/makefile
@@ -282,11 +282,6 @@ COMPRESS_Z_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\HmacSha1.obj \
   $O\Pbkdf2HmacSha1.obj \
@@ -326,6 +321,9 @@ C_BRANCH_OBJS = \
   $O\BranchSPARC.obj \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -375,12 +373,12 @@ OBJS = \
   $(C_OBJS) \
   $(C_LZ_OBJS) \
   $(C_BRANCH_OBJS) \
+  $(C_CRYPTO) \
   $O\HuffmanEncode.obj \
   $O\BlockSort.obj \
   $O\RangeCoderBit.obj \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $(CRYPTO_ZIP_OBJS) \
   $(CRYPTO_WZAES_OBJS) \
   $(CRYPTO_HASH_OBJS) \
@@ -484,8 +482,6 @@ $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
 
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL_O2)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O2_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL_O2)
 $(CRYPTO_ZIP_OBJS): ../../Crypto/Zip/$(*B).cpp
@@ -507,5 +503,7 @@ $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
 	$(COMPL_O2)
 $O\HuffmanEncode.obj: ../../../../C/Compress/Huffman/$(*B).c
 	$(COMPL_O2)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O2)
 
 !include "../../Crc.mak"
diff --git a/CPP/7zip/Bundles/Format7zR/makefile b/CPP/7zip/Bundles/Format7zR/makefile
index 972c6eb1..6e96a8a2 100755
--- a/CPP/7zip/Bundles/Format7zR/makefile
+++ b/CPP/7zip/Bundles/Format7zR/makefile
@@ -146,10 +146,6 @@ OBJS = \
   $(C_LZ_OBJS) \
   $(C_BRANCH_OBJS) \
   $O\RangeCoderBit.obj \
-  $(7ZAES_OPT_OBJS) \
-  $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
-  $(CRYPTO_HASH_OBJS) \
   $O\resource.res
 
 
diff --git a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
index 163b9298..a0d21d0e 100755
--- a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
+++ b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
@@ -360,37 +360,6 @@ SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Crypto\AES\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\AES_CBC.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescpp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescrypt.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aeskey.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aesopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aestab.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Crypto\AES\MyAES.cpp
 # End Source File
 # Begin Source File
@@ -783,6 +752,19 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
 SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
 # End Source File
 # End Group
+# Begin Group "C Crypto"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\..\..\C\7zCrc.c
diff --git a/CPP/7zip/Bundles/SFXCon/makefile b/CPP/7zip/Bundles/SFXCon/makefile
index b6c13088..dbe07baa 100755
--- a/CPP/7zip/Bundles/SFXCon/makefile
+++ b/CPP/7zip/Bundles/SFXCon/makefile
@@ -109,11 +109,6 @@ PPMD_OPT_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\Sha256.obj \
 
@@ -124,6 +119,9 @@ C_OBJS = \
 C_BRANCH_OBJS = \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -143,10 +141,10 @@ OBJS = \
   $(PPMD_OPT_OBJS) \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $(CRYPTO_HASH_OBJS) \
   $(C_OBJS) \
   $(C_BRANCH_OBJS) \
+  $(C_CRYPTO) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -184,15 +182,15 @@ $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
 
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O1_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL)
 $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
 	$(COMPL)
 $(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O2)
+	$(COMPL_O1)
 $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
-	$(COMPL_O2)
+	$(COMPL_O1)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O1)
 
 !include "../../Crc.mak"
diff --git a/CPP/7zip/Bundles/SFXSetup/makefile b/CPP/7zip/Bundles/SFXSetup/makefile
index e773ba41..99104f67 100755
--- a/CPP/7zip/Bundles/SFXSetup/makefile
+++ b/CPP/7zip/Bundles/SFXSetup/makefile
@@ -171,10 +171,8 @@ $O\ProgressDialog.obj: ../../FileManager/Resource/ProgressDialog/$(*B).cpp
 	$(COMPL)
 
 $(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O2)
-
+	$(COMPL_O1)
 $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
-	$(COMPL_O2)
+	$(COMPL_O1)
 
 !include "../../Crc.mak"
-
diff --git a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
index 23bdf2de..8ce4146d 100755
--- a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
+++ b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
@@ -340,37 +340,6 @@ SOURCE=..\..\Compress\Copy\CopyRegister.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Crypto\AES\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\AES_CBC.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescpp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aescrypt.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aeskey.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aesopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\AES\aestab.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Crypto\AES\MyAES.cpp
 # End Source File
 # Begin Source File
@@ -879,6 +848,19 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
 SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
 # End Source File
 # End Group
+# Begin Group "C Crypto"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Crypto\Aes.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\..\..\C\7zCrc.c
diff --git a/CPP/7zip/Bundles/SFXWin/makefile b/CPP/7zip/Bundles/SFXWin/makefile
index aab98921..733d804f 100755
--- a/CPP/7zip/Bundles/SFXWin/makefile
+++ b/CPP/7zip/Bundles/SFXWin/makefile
@@ -114,11 +114,6 @@ PPMD_OPT_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\Sha256.obj \
 
@@ -129,6 +124,9 @@ C_OBJS = \
 C_BRANCH_OBJS = \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -151,7 +149,6 @@ OBJS = \
   $(CRYPTO_HASH_OBJS) \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $O\MyMessages.obj \
   $O\MessagesDialog.obj \
   $O\OverwriteDialog.obj \
@@ -160,6 +157,7 @@ OBJS = \
   $(C_OBJS) \
   $(C_BRANCH_OBJS) \
   $(CRC_OBJS) \
+  $(C_CRYPTO) \
   $O\resource.res
 
 
@@ -204,8 +202,6 @@ $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL)
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O1_W3)
 
 $O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp
 	$(COMPL)
@@ -218,9 +214,10 @@ $O\PasswordDialog.obj: ../../FileManager/Resource/PasswordDialog/$(*B).cpp
 $O\ProgressDialog.obj: ../../FileManager/Resource/ProgressDialog/$(*B).cpp
 	$(COMPL)
 $(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O2)
+	$(COMPL_O1)
 $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
-	$(COMPL_O2)
+	$(COMPL_O1)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O1)
 
 !include "../../Crc.mak"
-	
\ No newline at end of file