8 files changed, 36 insertions, 75 deletions

diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 49dcaae..9533907 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -196,13 +196,6 @@ if !HOST_ASM_MACOSX_X86_64
 if !HOST_ASM_MASM_X86_64
 if !HOST_ASM_MINGW64_X86_64
 libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM
-libcrypto_la_SOURCES += aes/aes_cbc.c
-libcrypto_la_SOURCES += aes/aes_core.c
-libcrypto_la_SOURCES += camellia/camellia.c
-libcrypto_la_SOURCES += camellia/cmll_cbc.c
-libcrypto_la_SOURCES += rc4/rc4_enc.c
-libcrypto_la_SOURCES += rc4/rc4_skey.c
-libcrypto_la_SOURCES += whrlpool/wp_block.c
 endif
 endif
 endif
@@ -231,16 +224,12 @@ noinst_HEADERS += constant_time.h
 noinst_HEADERS += cryptlib.h
 noinst_HEADERS += crypto_internal.h
 noinst_HEADERS += crypto_local.h
-noinst_HEADERS += md32_common.h
 noinst_HEADERS += x86_arch.h
 
 # aes
-libcrypto_la_SOURCES += aes/aes_cfb.c
-libcrypto_la_SOURCES += aes/aes_ctr.c
-libcrypto_la_SOURCES += aes/aes_ecb.c
+libcrypto_la_SOURCES += aes/aes.c
+libcrypto_la_SOURCES += aes/aes_core.c
 libcrypto_la_SOURCES += aes/aes_ige.c
-libcrypto_la_SOURCES += aes/aes_ofb.c
-libcrypto_la_SOURCES += aes/aes_wrap.c
 noinst_HEADERS += aes/aes_local.h
 
 # asn1
@@ -308,11 +297,7 @@ noinst_HEADERS += asn1/asn1_local.h
 noinst_HEADERS += asn1/charmap.h
 
 # bf
-libcrypto_la_SOURCES += bf/bf_cfb64.c
-libcrypto_la_SOURCES += bf/bf_ecb.c
-libcrypto_la_SOURCES += bf/bf_enc.c
-libcrypto_la_SOURCES += bf/bf_ofb64.c
-libcrypto_la_SOURCES += bf/bf_skey.c
+libcrypto_la_SOURCES += bf/blowfish.c
 noinst_HEADERS += bf/bf_local.h
 
 # bio
@@ -440,22 +425,12 @@ libcrypto_la_SOURCES += bytestring/bs_cbb.c
 libcrypto_la_SOURCES += bytestring/bs_cbs.c
 
 # camellia
-libcrypto_la_SOURCES += camellia/cmll_cfb.c
-libcrypto_la_SOURCES += camellia/cmll_ctr.c
-libcrypto_la_SOURCES += camellia/cmll_ecb.c
-libcrypto_la_SOURCES += camellia/cmll_misc.c
-libcrypto_la_SOURCES += camellia/cmll_ofb.c
+libcrypto_la_SOURCES += camellia/camellia.c
 noinst_HEADERS += camellia/camellia.h
-noinst_HEADERS += camellia/cmll_local.h
 
 # cast
-libcrypto_la_SOURCES += cast/c_cfb64.c
-libcrypto_la_SOURCES += cast/c_ecb.c
-libcrypto_la_SOURCES += cast/c_enc.c
-libcrypto_la_SOURCES += cast/c_ofb64.c
-libcrypto_la_SOURCES += cast/c_skey.c
+libcrypto_la_SOURCES += cast/cast.c
 noinst_HEADERS += cast/cast_local.h
-noinst_HEADERS += cast/cast_s.h
 
 # chacha
 EXTRA_libcrypto_la_SOURCES += chacha/chacha-merged.c
@@ -645,11 +620,14 @@ noinst_HEADERS += evp/evp_local.h
 
 # hidden
 noinst_HEADERS += hidden/crypto_namespace.h
+noinst_HEADERS += hidden/openssl/aes.h
 noinst_HEADERS += hidden/openssl/asn1.h
 noinst_HEADERS += hidden/openssl/asn1t.h
 noinst_HEADERS += hidden/openssl/bio.h
+noinst_HEADERS += hidden/openssl/blowfish.h
 noinst_HEADERS += hidden/openssl/bn.h
 noinst_HEADERS += hidden/openssl/buffer.h
+noinst_HEADERS += hidden/openssl/camellia.h
 noinst_HEADERS += hidden/openssl/cast.h
 noinst_HEADERS += hidden/openssl/chacha.h
 noinst_HEADERS += hidden/openssl/cmac.h
@@ -658,9 +636,11 @@ noinst_HEADERS += hidden/openssl/conf_api.h
 noinst_HEADERS += hidden/openssl/crypto.h
 noinst_HEADERS += hidden/openssl/ct.h
 noinst_HEADERS += hidden/openssl/curve25519.h
+noinst_HEADERS += hidden/openssl/des.h
 noinst_HEADERS += hidden/openssl/dh.h
 noinst_HEADERS += hidden/openssl/dsa.h
 noinst_HEADERS += hidden/openssl/ec.h
+noinst_HEADERS += hidden/openssl/engine.h
 noinst_HEADERS += hidden/openssl/err.h
 noinst_HEADERS += hidden/openssl/hkdf.h
 noinst_HEADERS += hidden/openssl/hmac.h
@@ -678,6 +658,8 @@ noinst_HEADERS += hidden/openssl/poly1305.h
 noinst_HEADERS += hidden/openssl/posix_time.h
 noinst_HEADERS += hidden/openssl/rand.h
 noinst_HEADERS += hidden/openssl/rc2.h
+noinst_HEADERS += hidden/openssl/rc4.h
+noinst_HEADERS += hidden/openssl/ripemd.h
 noinst_HEADERS += hidden/openssl/rsa.h
 noinst_HEADERS += hidden/openssl/sha.h
 noinst_HEADERS += hidden/openssl/sm3.h
@@ -686,6 +668,7 @@ noinst_HEADERS += hidden/openssl/stack.h
 noinst_HEADERS += hidden/openssl/ts.h
 noinst_HEADERS += hidden/openssl/txt_db.h
 noinst_HEADERS += hidden/openssl/ui.h
+noinst_HEADERS += hidden/openssl/whrlpool.h
 noinst_HEADERS += hidden/openssl/x509.h
 noinst_HEADERS += hidden/openssl/x509_vfy.h
 noinst_HEADERS += hidden/openssl/x509v3.h
@@ -700,11 +683,7 @@ libcrypto_la_SOURCES += hmac/hmac.c
 noinst_HEADERS += hmac/hmac_local.h
 
 # idea
-libcrypto_la_SOURCES += idea/i_cbc.c
-libcrypto_la_SOURCES += idea/i_cfb64.c
-libcrypto_la_SOURCES += idea/i_ecb.c
-libcrypto_la_SOURCES += idea/i_ofb64.c
-libcrypto_la_SOURCES += idea/i_skey.c
+libcrypto_la_SOURCES += idea/idea.c
 noinst_HEADERS += idea/idea_local.h
 
 # kdf
@@ -808,7 +787,7 @@ libcrypto_la_SOURCES += rc2/rc2ofb64.c
 noinst_HEADERS += rc2/rc2_local.h
 
 # rc4
-noinst_HEADERS += rc4/rc4_local.h
+libcrypto_la_SOURCES += rc4/rc4.c
 
 # ripemd
 libcrypto_la_SOURCES += ripemd/ripemd.c
@@ -883,8 +862,7 @@ libcrypto_la_SOURCES += ui/ui_util.c
 noinst_HEADERS += ui/ui_local.h
 
 # whrlpool
-libcrypto_la_SOURCES += whrlpool/wp_dgst.c
-noinst_HEADERS += whrlpool/wp_local.h
+libcrypto_la_SOURCES += whrlpool/whirlpool.c
 
 # x509
 libcrypto_la_SOURCES += x509/by_dir.c
diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm
index 041c27c..4f88994 100644
--- a/crypto/Makefile.am.elf-arm
+++ b/crypto/Makefile.am.elf-arm
@@ -7,13 +7,6 @@ ASM_ARM_ELF += modes/ghash-elf-armv4.S
 ASM_ARM_ELF += armv4cpuid.S
 ASM_ARM_ELF += armcap.c
 
-ASM_ARM_ELF += aes/aes_cbc.c
-ASM_ARM_ELF += camellia/camellia.c
-ASM_ARM_ELF += camellia/cmll_cbc.c
-ASM_ARM_ELF += rc4/rc4_enc.c
-ASM_ARM_ELF += rc4/rc4_skey.c
-ASM_ARM_ELF += whrlpool/wp_block.c
-
 EXTRA_DIST += $(ASM_ARM_ELF)
 
 if HOST_ASM_ELF_ARM
diff --git a/crypto/Makefile.am.elf-mips b/crypto/Makefile.am.elf-mips
index 9c4a70f..ea0a730 100644
--- a/crypto/Makefile.am.elf-mips
+++ b/crypto/Makefile.am.elf-mips
@@ -5,13 +5,6 @@ ASM_MIPS_ELF += sha/sha1-mips.S
 ASM_MIPS_ELF += sha/sha512-mips.S
 ASM_MIPS_ELF += sha/sha256-mips.S
 
-ASM_MIPS_ELF += aes/aes_cbc.c
-ASM_MIPS_ELF += camellia/camellia.c
-ASM_MIPS_ELF += camellia/cmll_cbc.c
-ASM_MIPS_ELF += rc4/rc4_enc.c
-ASM_MIPS_ELF += rc4/rc4_skey.c
-ASM_MIPS_ELF += whrlpool/wp_block.c
-
 EXTRA_DIST += $(ASM_MIPS_ELF)
 
 if HOST_ASM_ELF_MIPS
diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64
index c599fa8..8f851f3 100644
--- a/crypto/Makefile.am.elf-mips64
+++ b/crypto/Makefile.am.elf-mips64
@@ -5,13 +5,6 @@ ASM_MIPS64_ELF += sha/sha1-mips.S
 ASM_MIPS64_ELF += sha/sha512-mips.S
 ASM_MIPS64_ELF += sha/sha256-mips.S
 
-ASM_MIPS64_ELF += aes/aes_cbc.c
-ASM_MIPS64_ELF += camellia/camellia.c
-ASM_MIPS64_ELF += camellia/cmll_cbc.c
-ASM_MIPS64_ELF += rc4/rc4_enc.c
-ASM_MIPS64_ELF += rc4/rc4_skey.c
-ASM_MIPS64_ELF += whrlpool/wp_block.c
-
 EXTRA_DIST += $(ASM_MIPS64_ELF)
 
 if HOST_ASM_ELF_MIPS64
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 88be1d5..6933a11 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -3,19 +3,15 @@ ASM_X86_64_ELF = aes/aes-elf-x86_64.S
 ASM_X86_64_ELF += aes/bsaes-elf-x86_64.S
 ASM_X86_64_ELF += aes/vpaes-elf-x86_64.S
 ASM_X86_64_ELF += aes/aesni-elf-x86_64.S
-ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.S
 ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S
 ASM_X86_64_ELF += bn/mont-elf-x86_64.S
 ASM_X86_64_ELF += bn/mont5-elf-x86_64.S
-ASM_X86_64_ELF += camellia/cmll-elf-x86_64.S
 ASM_X86_64_ELF += md5/md5-elf-x86_64.S
 ASM_X86_64_ELF += modes/ghash-elf-x86_64.S
 ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
-ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.S
 ASM_X86_64_ELF += sha/sha1-elf-x86_64.S
 ASM_X86_64_ELF += sha/sha256-elf-x86_64.S
 ASM_X86_64_ELF += sha/sha512-elf-x86_64.S
-ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.S
 ASM_X86_64_ELF += cpuid-elf-x86_64.S
 
 ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S
@@ -37,6 +33,11 @@ if HOST_ASM_ELF_X86_64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
+libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index b9b89cf..1020567 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -3,19 +3,15 @@ ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.S
 ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.S
 ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.S
 ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.S
-ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.S
 ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S
 ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S
 ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S
-ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.S
 ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S
 ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S
 ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
-ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.S
 ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S
 ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S
 ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S
-ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.S
 ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S
 
 ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S
@@ -37,6 +33,11 @@ if HOST_ASM_MACOSX_X86_64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
+libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64
index b914cb6..7da3cc2 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -3,19 +3,15 @@ ASM_X86_64_MASM = aes/aes-masm-x86_64.S
 ASM_X86_64_MASM += aes/bsaes-masm-x86_64.S
 ASM_X86_64_MASM += aes/vpaes-masm-x86_64.S
 ASM_X86_64_MASM += aes/aesni-masm-x86_64.S
-ASM_X86_64_MASM += aes/aesni-sha1-masm-x86_64.S
 ASM_X86_64_MASM += bn/modexp512-masm-x86_64.S
 ASM_X86_64_MASM += bn/mont-masm-x86_64.S
 ASM_X86_64_MASM += bn/mont5-masm-x86_64.S
-ASM_X86_64_MASM += camellia/cmll-masm-x86_64.S
 ASM_X86_64_MASM += md5/md5-masm-x86_64.S
 ASM_X86_64_MASM += modes/ghash-masm-x86_64.S
 ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
-ASM_X86_64_MASM += rc4/rc4-md5-masm-x86_64.S
 ASM_X86_64_MASM += sha/sha1-masm-x86_64.S
 ASM_X86_64_MASM += sha/sha256-masm-x86_64.S
 ASM_X86_64_MASM += sha/sha512-masm-x86_64.S
-ASM_X86_64_MASM += whrlpool/wp-masm-x86_64.S
 ASM_X86_64_MASM += cpuid-masm-x86_64.S
 
 EXTRA_DIST += $(ASM_X86_64_MASM)
@@ -24,6 +20,11 @@ if HOST_ASM_MASM_X86_64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
+libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64
index 12f41a5..7d0d3f7 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -3,19 +3,15 @@ ASM_X86_64_MINGW64 = aes/aes-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += aes/bsaes-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += aes/vpaes-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += aes/aesni-mingw64-x86_64.S
-ASM_X86_64_MINGW64 += aes/aesni-sha1-mingw64-x86_64.S
 #ASM_X86_64_MINGW64 += bn/modexp512-mingw64-x86_64.S
 #ASM_X86_64_MINGW64 += bn/mont-mingw64-x86_64.S
 #ASM_X86_64_MINGW64 += bn/mont5-mingw64-x86_64.S
-ASM_X86_64_MINGW64 += camellia/cmll-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
-ASM_X86_64_MINGW64 += rc4/rc4-md5-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S
-ASM_X86_64_MINGW64 += whrlpool/wp-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += cpuid-mingw64-x86_64.S
 
 EXTRA_DIST += $(ASM_X86_64_MINGW64)
@@ -25,6 +21,11 @@ libcrypto_la_CPPFLAGS += -Dendbr32=endbr64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
+libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
+libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5