Skip to content

Commit 7428e55

Browse files
botovqbotovq
committed
Disable MD5 ASM
1 parent 49aacfc commit 7428e55

6 files changed

+0
-17
lines changed

‎crypto/CMakeLists.txt

-8
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ if(HOST_ASM_ELF_X86_64)
3232
bn/modexp512-elf-x86_64.S
3333
bn/mont-elf-x86_64.S
3434
bn/mont5-elf-x86_64.S
35-
md5/md5-elf-x86_64.S
3635
modes/ghash-elf-x86_64.S
3736
rc4/rc4-elf-x86_64.S
3837

@@ -55,7 +54,6 @@ if(HOST_ASM_ELF_X86_64)
5554
add_definitions(-DOPENSSL_IA32_SSE2)
5655
add_definitions(-DOPENSSL_BN_ASM_MONT)
5756
add_definitions(-DOPENSSL_BN_ASM_MONT5)
58-
add_definitions(-DMD5_ASM)
5957
add_definitions(-DGHASH_ASM)
6058
add_definitions(-DRSA_ASM)
6159
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
@@ -71,7 +69,6 @@ if(HOST_ASM_MACOSX_X86_64)
7169
bn/modexp512-macosx-x86_64.S
7270
bn/mont-macosx-x86_64.S
7371
bn/mont5-macosx-x86_64.S
74-
md5/md5-macosx-x86_64.S
7572
modes/ghash-macosx-x86_64.S
7673
rc4/rc4-macosx-x86_64.S
7774

@@ -94,7 +91,6 @@ if(HOST_ASM_MACOSX_X86_64)
9491
add_definitions(-DOPENSSL_IA32_SSE2)
9592
add_definitions(-DOPENSSL_BN_ASM_MONT)
9693
add_definitions(-DOPENSSL_BN_ASM_MONT5)
97-
add_definitions(-DMD5_ASM)
9894
add_definitions(-DGHASH_ASM)
9995
add_definitions(-DRSA_ASM)
10096
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
@@ -111,7 +107,6 @@ if(HOST_ASM_MASM_X86_64)
111107
#bn/modexp512-masm-x86_64.S
112108
#bn/mont-masm-x86_64.S
113109
#bn/mont5-masm-x86_64.S
114-
md5/md5-masm-x86_64.S
115110
modes/ghash-masm-x86_64.S
116111
rc4/rc4-masm-x86_64.S
117112
)
@@ -122,7 +117,6 @@ if(HOST_ASM_MASM_X86_64)
122117
add_definitions(-DOPENSSL_IA32_SSE2)
123118
#add_definitions(-DOPENSSL_BN_ASM_MONT)
124119
#add_definitions(-DOPENSSL_BN_ASM_MONT5)
125-
add_definitions(-DMD5_ASM)
126120
add_definitions(-DGHASH_ASM)
127121
add_definitions(-DRSA_ASM)
128122
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
@@ -139,7 +133,6 @@ if(HOST_ASM_MINGW64_X86_64)
139133
#bn/modexp512-mingw64-x86_64.S
140134
#bn/mont-mingw64-x86_64.S
141135
#bn/mont5-mingw64-x86_64.S
142-
md5/md5-mingw64-x86_64.S
143136
modes/ghash-mingw64-x86_64.S
144137
rc4/rc4-mingw64-x86_64.S
145138
)
@@ -150,7 +143,6 @@ if(HOST_ASM_MINGW64_X86_64)
150143
add_definitions(-DOPENSSL_IA32_SSE2)
151144
#add_definitions(-DOPENSSL_BN_ASM_MONT)
152145
#add_definitions(-DOPENSSL_BN_ASM_MONT5)
153-
add_definitions(-DMD5_ASM)
154146
add_definitions(-DGHASH_ASM)
155147
add_definitions(-DRSA_ASM)
156148
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})

‎crypto/Makefile.am.elf-x86_64

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ASM_X86_64_ELF += aes/aesni-elf-x86_64.S
66
ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S
77
ASM_X86_64_ELF += bn/mont-elf-x86_64.S
88
ASM_X86_64_ELF += bn/mont5-elf-x86_64.S
9-
ASM_X86_64_ELF += md5/md5-elf-x86_64.S
109
ASM_X86_64_ELF += modes/ghash-elf-x86_64.S
1110
ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
1211

@@ -32,7 +31,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM
3231
libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
3332
libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
3433
libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
35-
libcrypto_la_CPPFLAGS += -DMD5_ASM
3634
libcrypto_la_CPPFLAGS += -DGHASH_ASM
3735
libcrypto_la_CPPFLAGS += -DRSA_ASM
3836
libcrypto_la_SOURCES += $(ASM_X86_64_ELF)

‎crypto/Makefile.am.macosx-x86_64

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.S
66
ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S
77
ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S
88
ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S
9-
ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S
109
ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S
1110
ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
1211

@@ -32,7 +31,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM
3231
libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
3332
libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
3433
libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
35-
libcrypto_la_CPPFLAGS += -DMD5_ASM
3634
libcrypto_la_CPPFLAGS += -DGHASH_ASM
3735
libcrypto_la_CPPFLAGS += -DRSA_ASM
3836
libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX)

‎crypto/Makefile.am.masm-x86_64

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ASM_X86_64_MASM += aes/aesni-masm-x86_64.S
66
ASM_X86_64_MASM += bn/modexp512-masm-x86_64.S
77
ASM_X86_64_MASM += bn/mont-masm-x86_64.S
88
ASM_X86_64_MASM += bn/mont5-masm-x86_64.S
9-
ASM_X86_64_MASM += md5/md5-masm-x86_64.S
109
ASM_X86_64_MASM += modes/ghash-masm-x86_64.S
1110
ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
1211

@@ -19,7 +18,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM
1918
libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
2019
libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
2120
libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
22-
libcrypto_la_CPPFLAGS += -DMD5_ASM
2321
libcrypto_la_CPPFLAGS += -DGHASH_ASM
2422
libcrypto_la_CPPFLAGS += -DRSA_ASM
2523
libcrypto_la_SOURCES += $(ASM_X86_64_MASM)

‎crypto/Makefile.am.mingw64-x86_64

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ASM_X86_64_MINGW64 += aes/aesni-mingw64-x86_64.S
66
#ASM_X86_64_MINGW64 += bn/modexp512-mingw64-x86_64.S
77
#ASM_X86_64_MINGW64 += bn/mont-mingw64-x86_64.S
88
#ASM_X86_64_MINGW64 += bn/mont5-mingw64-x86_64.S
9-
ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S
109
ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S
1110
ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
1211

@@ -20,7 +19,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM
2019
libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
2120
#libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
2221
#libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
23-
libcrypto_la_CPPFLAGS += -DMD5_ASM
2422
libcrypto_la_CPPFLAGS += -DGHASH_ASM
2523
libcrypto_la_CPPFLAGS += -DRSA_ASM
2624
libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64)

‎update.sh

-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ for abi in elf macosx masm mingw64; do
280280
gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl bn/modexp512-$abi-x86_64.S
281281
gen_asm_stdout $abi bn/asm/x86_64-mont.pl bn/mont-$abi-x86_64.S
282282
gen_asm_stdout $abi bn/asm/x86_64-mont5.pl bn/mont5-$abi-x86_64.S
283-
gen_asm_stdout $abi md5/asm/md5-x86_64.pl md5/md5-$abi-x86_64.S
284283
gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S
285284
gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S
286285
done

0 commit comments

Comments
 (0)