diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 92a10baed5..c677c3a146 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -32,7 +32,6 @@ if(HOST_ASM_ELF_X86_64) bn/modexp512-elf-x86_64.S bn/mont-elf-x86_64.S bn/mont5-elf-x86_64.S - md5/md5-elf-x86_64.S modes/ghash-elf-x86_64.S rc4/rc4-elf-x86_64.S @@ -55,7 +54,6 @@ if(HOST_ASM_ELF_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) add_definitions(-DOPENSSL_BN_ASM_MONT) add_definitions(-DOPENSSL_BN_ASM_MONT5) - add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) @@ -71,7 +69,6 @@ if(HOST_ASM_MACOSX_X86_64) bn/modexp512-macosx-x86_64.S bn/mont-macosx-x86_64.S bn/mont5-macosx-x86_64.S - md5/md5-macosx-x86_64.S modes/ghash-macosx-x86_64.S rc4/rc4-macosx-x86_64.S @@ -94,7 +91,6 @@ if(HOST_ASM_MACOSX_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) add_definitions(-DOPENSSL_BN_ASM_MONT) add_definitions(-DOPENSSL_BN_ASM_MONT5) - add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) @@ -111,7 +107,6 @@ if(HOST_ASM_MASM_X86_64) #bn/modexp512-masm-x86_64.S #bn/mont-masm-x86_64.S #bn/mont5-masm-x86_64.S - md5/md5-masm-x86_64.S modes/ghash-masm-x86_64.S rc4/rc4-masm-x86_64.S ) @@ -122,7 +117,6 @@ if(HOST_ASM_MASM_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) #add_definitions(-DOPENSSL_BN_ASM_MONT) #add_definitions(-DOPENSSL_BN_ASM_MONT5) - add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) @@ -139,7 +133,6 @@ if(HOST_ASM_MINGW64_X86_64) #bn/modexp512-mingw64-x86_64.S #bn/mont-mingw64-x86_64.S #bn/mont5-mingw64-x86_64.S - md5/md5-mingw64-x86_64.S modes/ghash-mingw64-x86_64.S rc4/rc4-mingw64-x86_64.S ) @@ -150,7 +143,6 @@ if(HOST_ASM_MINGW64_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) #add_definitions(-DOPENSSL_BN_ASM_MONT) #add_definitions(-DOPENSSL_BN_ASM_MONT5) - add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index 6feeb91f2c..c62662c792 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_ELF += aes/aesni-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 += 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 @@ -32,7 +31,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_SOURCES += $(ASM_X86_64_ELF) diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index d9df49a986..010e3be826 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_MACOSX += aes/aesni-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 += 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 @@ -32,7 +31,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index 90641a7294..2ef7e1b638 100644 --- a/crypto/Makefile.am.masm-x86_64 +++ b/crypto/Makefile.am.masm-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_MASM += aes/aesni-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 += 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 @@ -19,7 +18,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MASM) diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index ec40b9e4b1..8e39e9f745 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_MINGW64 += aes/aesni-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 += 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 @@ -20,7 +19,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) diff --git a/update.sh b/update.sh index 164f68f1dc..9636ee7e97 100755 --- a/update.sh +++ b/update.sh @@ -280,7 +280,6 @@ for abi in elf macosx masm mingw64; do gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl bn/modexp512-$abi-x86_64.S gen_asm_stdout $abi bn/asm/x86_64-mont.pl bn/mont-$abi-x86_64.S gen_asm_stdout $abi bn/asm/x86_64-mont5.pl bn/mont5-$abi-x86_64.S - gen_asm_stdout $abi md5/asm/md5-x86_64.pl md5/md5-$abi-x86_64.S gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S done