1 files changed, 8 insertions, 70 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 87fb2d8..835bb2b 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -30,19 +30,15 @@ if(HOST_ASM_ELF_X86_64)
                 aes/bsaes-elf-x86_64.S
                 aes/vpaes-elf-x86_64.S
                 aes/aesni-elf-x86_64.S
-                aes/aesni-sha1-elf-x86_64.S
                 bn/modexp512-elf-x86_64.S
                 bn/mont-elf-x86_64.S
                 bn/mont5-elf-x86_64.S
-                camellia/cmll-elf-x86_64.S
                 md5/md5-elf-x86_64.S
                 modes/ghash-elf-x86_64.S
                 rc4/rc4-elf-x86_64.S
-                rc4/rc4-md5-elf-x86_64.S
                 sha/sha1-elf-x86_64.S
                 sha/sha256-elf-x86_64.S
                 sha/sha512-elf-x86_64.S
-                whrlpool/wp-elf-x86_64.S
                 cpuid-elf-x86_64.S
 
                 bn/arch/amd64/bignum_add.S
@@ -83,19 +79,15 @@ if(HOST_ASM_MACOSX_X86_64)
                 aes/bsaes-macosx-x86_64.S
                 aes/vpaes-macosx-x86_64.S
                 aes/aesni-macosx-x86_64.S
-                aes/aesni-sha1-macosx-x86_64.S
                 bn/modexp512-macosx-x86_64.S
                 bn/mont-macosx-x86_64.S
                 bn/mont5-macosx-x86_64.S
-                camellia/cmll-macosx-x86_64.S
                 md5/md5-macosx-x86_64.S
                 modes/ghash-macosx-x86_64.S
                 rc4/rc4-macosx-x86_64.S
-                rc4/rc4-md5-macosx-x86_64.S
                 sha/sha1-macosx-x86_64.S
                 sha/sha256-macosx-x86_64.S
                 sha/sha512-macosx-x86_64.S
-                whrlpool/wp-macosx-x86_64.S
                 cpuid-macosx-x86_64.S
 
                 bn/arch/amd64/bignum_add.S
@@ -137,19 +129,15 @@ if(HOST_ASM_MASM_X86_64)
                 aes/bsaes-masm-x86_64.S
                 aes/vpaes-masm-x86_64.S
                 aes/aesni-masm-x86_64.S
-                aes/aesni-sha1-masm-x86_64.S
                 #bn/modexp512-masm-x86_64.S
                 #bn/mont-masm-x86_64.S
                 #bn/mont5-masm-x86_64.S
-                camellia/cmll-masm-x86_64.S
                 md5/md5-masm-x86_64.S
                 modes/ghash-masm-x86_64.S
                 rc4/rc4-masm-x86_64.S
-                rc4/rc4-md5-masm-x86_64.S
                 sha/sha1-masm-x86_64.S
                 sha/sha256-masm-x86_64.S
                 sha/sha512-masm-x86_64.S
-                whrlpool/wp-masm-x86_64.S
                 cpuid-masm-x86_64.S
         )
         add_definitions(-Dendbr64=)
@@ -178,19 +166,15 @@ if(HOST_ASM_MINGW64_X86_64)
                 aes/bsaes-mingw64-x86_64.S
                 aes/vpaes-mingw64-x86_64.S
                 aes/aesni-mingw64-x86_64.S
-                aes/aesni-sha1-mingw64-x86_64.S
                 #bn/modexp512-mingw64-x86_64.S
                 #bn/mont-mingw64-x86_64.S
                 #bn/mont5-mingw64-x86_64.S
-                camellia/cmll-mingw64-x86_64.S
                 md5/md5-mingw64-x86_64.S
                 modes/ghash-mingw64-x86_64.S
                 rc4/rc4-mingw64-x86_64.S
-                rc4/rc4-md5-mingw64-x86_64.S
                 sha/sha1-mingw64-x86_64.S
                 sha/sha256-mingw64-x86_64.S
                 sha/sha512-mingw64-x86_64.S
-                whrlpool/wp-mingw64-x86_64.S
                 cpuid-mingw64-x86_64.S
         )
         add_definitions(-Dendbr32=endbr64)
@@ -212,34 +196,6 @@ if(HOST_ASM_MINGW64_X86_64)
         set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C)
 endif()
 
-if((NOT HOST_ASM_ELF_X86_64) AND
-        (NOT HOST_ASM_MACOSX_X86_64) AND
-        (NOT HOST_ASM_MASM_X86_64) AND
-        (NOT HOST_ASM_MINGW64_X86_64) AND
-        (NOT HOST_ASM_ELF_ARMV4))
-        set(
-                CRYPTO_SRC
-                ${CRYPTO_SRC}
-                aes/aes_core.c
-        )
-endif()
-
-if((NOT HOST_ASM_ELF_X86_64) AND
-        (NOT HOST_ASM_MACOSX_X86_64) AND
-        (NOT HOST_ASM_MASM_X86_64) AND
-        (NOT HOST_ASM_MINGW64_X86_64))
-        set(
-                CRYPTO_SRC
-                ${CRYPTO_SRC}
-                aes/aes_cbc.c
-                camellia/camellia.c
-                camellia/cmll_cbc.c
-                rc4/rc4_enc.c
-                rc4/rc4_skey.c
-                whrlpool/wp_block.c
-        )
-endif()
-
 set(
         CRYPTO_SRC
         ${CRYPTO_SRC}
@@ -253,12 +209,9 @@ set(
         mem_dbg.c
         o_fips.c
         o_str.c
-        aes/aes_cfb.c
-        aes/aes_ctr.c
-        aes/aes_ecb.c
+        aes/aes.c
+        aes/aes_core.c
         aes/aes_ige.c
-        aes/aes_ofb.c
-        aes/aes_wrap.c
         asn1/a_bitstr.c
         asn1/a_enum.c
         asn1/a_int.c
@@ -319,11 +272,7 @@ set(
         asn1/x_val.c
         asn1/x_x509.c
         asn1/x_x509a.c
-        bf/bf_cfb64.c
-        bf/bf_ecb.c
-        bf/bf_enc.c
-        bf/bf_ofb64.c
-        bf/bf_skey.c
+        bf/blowfish.c
         bio/b_dump.c
         bio/b_print.c
         bio/b_sock.c
@@ -373,16 +322,8 @@ set(
         bytestring/bs_ber.c
         bytestring/bs_cbb.c
         bytestring/bs_cbs.c
-        camellia/cmll_cfb.c
-        camellia/cmll_ctr.c
-        camellia/cmll_ecb.c
-        camellia/cmll_misc.c
-        camellia/cmll_ofb.c
-        cast/c_cfb64.c
-        cast/c_ecb.c
-        cast/c_enc.c
-        cast/c_ofb64.c
-        cast/c_skey.c
+        camellia/camellia.c
+        cast/cast.c
         chacha/chacha.c
         cmac/cm_ameth.c
         cmac/cm_pmeth.c
@@ -529,11 +470,7 @@ set(
         hmac/hm_ameth.c
         hmac/hm_pmeth.c
         hmac/hmac.c
-        idea/i_cbc.c
-        idea/i_cfb64.c
-        idea/i_ecb.c
-        idea/i_ofb64.c
-        idea/i_skey.c
+        idea/idea.c
         kdf/hkdf_evp.c
         kdf/kdf_err.c
         lhash/lhash.c
@@ -601,6 +538,7 @@ set(
         rc2/rc2_skey.c
         rc2/rc2cfb64.c
         rc2/rc2ofb64.c
+        rc4/rc4.c
         ripemd/ripemd.c
         rsa/rsa_ameth.c
         rsa/rsa_asn1.c
@@ -643,7 +581,7 @@ set(
         ui/ui_lib.c
         ui/ui_null.c
         ui/ui_util.c
-        whrlpool/wp_dgst.c
+        whrlpool/whirlpool.c
         x509/by_dir.c
         x509/by_file.c
         x509/by_mem.c