diff options
author | Theo Buehler <tb@openbsd.org> | 2025-01-22 20:22:39 +0100 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2025-01-24 15:10:22 +0100 |
commit | 7428e5554cf44e9606dc72ba65671da5e127fd22 (patch) | |
tree | b817d97fcf09f43ba002c1c6a80de4dea498788a | |
parent | 49aacfca015ccfc767dd4dbfe38cf7e88a354391 (diff) | |
download | portable-7428e5554cf44e9606dc72ba65671da5e127fd22.tar.gz portable-7428e5554cf44e9606dc72ba65671da5e127fd22.tar.bz2 portable-7428e5554cf44e9606dc72ba65671da5e127fd22.zip |
Disable MD5 ASM
-rw-r--r-- | crypto/CMakeLists.txt | 8 | ||||
-rw-r--r-- | crypto/Makefile.am.elf-x86_64 | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.macosx-x86_64 | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.masm-x86_64 | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.mingw64-x86_64 | 2 | ||||
-rwxr-xr-x | update.sh | 1 |
6 files changed, 0 insertions, 17 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 92a10ba..c677c3a 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -32,7 +32,6 @@ if(HOST_ASM_ELF_X86_64) | |||
32 | bn/modexp512-elf-x86_64.S | 32 | bn/modexp512-elf-x86_64.S |
33 | bn/mont-elf-x86_64.S | 33 | bn/mont-elf-x86_64.S |
34 | bn/mont5-elf-x86_64.S | 34 | bn/mont5-elf-x86_64.S |
35 | md5/md5-elf-x86_64.S | ||
36 | modes/ghash-elf-x86_64.S | 35 | modes/ghash-elf-x86_64.S |
37 | rc4/rc4-elf-x86_64.S | 36 | rc4/rc4-elf-x86_64.S |
38 | 37 | ||
@@ -55,7 +54,6 @@ if(HOST_ASM_ELF_X86_64) | |||
55 | add_definitions(-DOPENSSL_IA32_SSE2) | 54 | add_definitions(-DOPENSSL_IA32_SSE2) |
56 | add_definitions(-DOPENSSL_BN_ASM_MONT) | 55 | add_definitions(-DOPENSSL_BN_ASM_MONT) |
57 | add_definitions(-DOPENSSL_BN_ASM_MONT5) | 56 | add_definitions(-DOPENSSL_BN_ASM_MONT5) |
58 | add_definitions(-DMD5_ASM) | ||
59 | add_definitions(-DGHASH_ASM) | 57 | add_definitions(-DGHASH_ASM) |
60 | add_definitions(-DRSA_ASM) | 58 | add_definitions(-DRSA_ASM) |
61 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) | 59 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) |
@@ -71,7 +69,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
71 | bn/modexp512-macosx-x86_64.S | 69 | bn/modexp512-macosx-x86_64.S |
72 | bn/mont-macosx-x86_64.S | 70 | bn/mont-macosx-x86_64.S |
73 | bn/mont5-macosx-x86_64.S | 71 | bn/mont5-macosx-x86_64.S |
74 | md5/md5-macosx-x86_64.S | ||
75 | modes/ghash-macosx-x86_64.S | 72 | modes/ghash-macosx-x86_64.S |
76 | rc4/rc4-macosx-x86_64.S | 73 | rc4/rc4-macosx-x86_64.S |
77 | 74 | ||
@@ -94,7 +91,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
94 | add_definitions(-DOPENSSL_IA32_SSE2) | 91 | add_definitions(-DOPENSSL_IA32_SSE2) |
95 | add_definitions(-DOPENSSL_BN_ASM_MONT) | 92 | add_definitions(-DOPENSSL_BN_ASM_MONT) |
96 | add_definitions(-DOPENSSL_BN_ASM_MONT5) | 93 | add_definitions(-DOPENSSL_BN_ASM_MONT5) |
97 | add_definitions(-DMD5_ASM) | ||
98 | add_definitions(-DGHASH_ASM) | 94 | add_definitions(-DGHASH_ASM) |
99 | add_definitions(-DRSA_ASM) | 95 | add_definitions(-DRSA_ASM) |
100 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) | 96 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) |
@@ -111,7 +107,6 @@ if(HOST_ASM_MASM_X86_64) | |||
111 | #bn/modexp512-masm-x86_64.S | 107 | #bn/modexp512-masm-x86_64.S |
112 | #bn/mont-masm-x86_64.S | 108 | #bn/mont-masm-x86_64.S |
113 | #bn/mont5-masm-x86_64.S | 109 | #bn/mont5-masm-x86_64.S |
114 | md5/md5-masm-x86_64.S | ||
115 | modes/ghash-masm-x86_64.S | 110 | modes/ghash-masm-x86_64.S |
116 | rc4/rc4-masm-x86_64.S | 111 | rc4/rc4-masm-x86_64.S |
117 | ) | 112 | ) |
@@ -122,7 +117,6 @@ if(HOST_ASM_MASM_X86_64) | |||
122 | add_definitions(-DOPENSSL_IA32_SSE2) | 117 | add_definitions(-DOPENSSL_IA32_SSE2) |
123 | #add_definitions(-DOPENSSL_BN_ASM_MONT) | 118 | #add_definitions(-DOPENSSL_BN_ASM_MONT) |
124 | #add_definitions(-DOPENSSL_BN_ASM_MONT5) | 119 | #add_definitions(-DOPENSSL_BN_ASM_MONT5) |
125 | add_definitions(-DMD5_ASM) | ||
126 | add_definitions(-DGHASH_ASM) | 120 | add_definitions(-DGHASH_ASM) |
127 | add_definitions(-DRSA_ASM) | 121 | add_definitions(-DRSA_ASM) |
128 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) | 122 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) |
@@ -139,7 +133,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
139 | #bn/modexp512-mingw64-x86_64.S | 133 | #bn/modexp512-mingw64-x86_64.S |
140 | #bn/mont-mingw64-x86_64.S | 134 | #bn/mont-mingw64-x86_64.S |
141 | #bn/mont5-mingw64-x86_64.S | 135 | #bn/mont5-mingw64-x86_64.S |
142 | md5/md5-mingw64-x86_64.S | ||
143 | modes/ghash-mingw64-x86_64.S | 136 | modes/ghash-mingw64-x86_64.S |
144 | rc4/rc4-mingw64-x86_64.S | 137 | rc4/rc4-mingw64-x86_64.S |
145 | ) | 138 | ) |
@@ -150,7 +143,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
150 | add_definitions(-DOPENSSL_IA32_SSE2) | 143 | add_definitions(-DOPENSSL_IA32_SSE2) |
151 | #add_definitions(-DOPENSSL_BN_ASM_MONT) | 144 | #add_definitions(-DOPENSSL_BN_ASM_MONT) |
152 | #add_definitions(-DOPENSSL_BN_ASM_MONT5) | 145 | #add_definitions(-DOPENSSL_BN_ASM_MONT5) |
153 | add_definitions(-DMD5_ASM) | ||
154 | add_definitions(-DGHASH_ASM) | 146 | add_definitions(-DGHASH_ASM) |
155 | add_definitions(-DRSA_ASM) | 147 | add_definitions(-DRSA_ASM) |
156 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) | 148 | 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 6feeb91..c62662c 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 | |||
6 | ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S | 6 | ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S |
7 | ASM_X86_64_ELF += bn/mont-elf-x86_64.S | 7 | ASM_X86_64_ELF += bn/mont-elf-x86_64.S |
8 | ASM_X86_64_ELF += bn/mont5-elf-x86_64.S | 8 | ASM_X86_64_ELF += bn/mont5-elf-x86_64.S |
9 | ASM_X86_64_ELF += md5/md5-elf-x86_64.S | ||
10 | ASM_X86_64_ELF += modes/ghash-elf-x86_64.S | 9 | ASM_X86_64_ELF += modes/ghash-elf-x86_64.S |
11 | ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S | 10 | ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S |
12 | 11 | ||
@@ -32,7 +31,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM | |||
32 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 | 31 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 |
33 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT | 32 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT |
34 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | 33 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 |
35 | libcrypto_la_CPPFLAGS += -DMD5_ASM | ||
36 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 34 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
37 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 35 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
38 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) | 36 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) |
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index d9df49a..010e3be 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 | |||
6 | ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S | 6 | ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S |
7 | ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S | 7 | ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S |
8 | ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S | 8 | ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S |
9 | ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S | ||
10 | ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S | 9 | ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S |
11 | ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S | 10 | ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S |
12 | 11 | ||
@@ -32,7 +31,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM | |||
32 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 | 31 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 |
33 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT | 32 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT |
34 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | 33 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 |
35 | libcrypto_la_CPPFLAGS += -DMD5_ASM | ||
36 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 34 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
37 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 35 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
38 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) | 36 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) |
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index 90641a7..2ef7e1b 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 | |||
6 | ASM_X86_64_MASM += bn/modexp512-masm-x86_64.S | 6 | ASM_X86_64_MASM += bn/modexp512-masm-x86_64.S |
7 | ASM_X86_64_MASM += bn/mont-masm-x86_64.S | 7 | ASM_X86_64_MASM += bn/mont-masm-x86_64.S |
8 | ASM_X86_64_MASM += bn/mont5-masm-x86_64.S | 8 | ASM_X86_64_MASM += bn/mont5-masm-x86_64.S |
9 | ASM_X86_64_MASM += md5/md5-masm-x86_64.S | ||
10 | ASM_X86_64_MASM += modes/ghash-masm-x86_64.S | 9 | ASM_X86_64_MASM += modes/ghash-masm-x86_64.S |
11 | ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S | 10 | ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S |
12 | 11 | ||
@@ -19,7 +18,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM | |||
19 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 | 18 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 |
20 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT | 19 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT |
21 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | 20 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 |
22 | libcrypto_la_CPPFLAGS += -DMD5_ASM | ||
23 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 21 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
24 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 22 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
25 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) | 23 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) |
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index ec40b9e..8e39e9f 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 | |||
6 | #ASM_X86_64_MINGW64 += bn/modexp512-mingw64-x86_64.S | 6 | #ASM_X86_64_MINGW64 += bn/modexp512-mingw64-x86_64.S |
7 | #ASM_X86_64_MINGW64 += bn/mont-mingw64-x86_64.S | 7 | #ASM_X86_64_MINGW64 += bn/mont-mingw64-x86_64.S |
8 | #ASM_X86_64_MINGW64 += bn/mont5-mingw64-x86_64.S | 8 | #ASM_X86_64_MINGW64 += bn/mont5-mingw64-x86_64.S |
9 | ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S | ||
10 | ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S | 9 | ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S |
11 | ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S | 10 | ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S |
12 | 11 | ||
@@ -20,7 +19,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM | |||
20 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 | 19 | libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 |
21 | #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT | 20 | #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT |
22 | #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | 21 | #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 |
23 | libcrypto_la_CPPFLAGS += -DMD5_ASM | ||
24 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 22 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
25 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 23 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
26 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) | 24 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) |
@@ -280,7 +280,6 @@ for abi in elf macosx masm mingw64; do | |||
280 | gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl bn/modexp512-$abi-x86_64.S | 280 | gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl bn/modexp512-$abi-x86_64.S |
281 | gen_asm_stdout $abi bn/asm/x86_64-mont.pl bn/mont-$abi-x86_64.S | 281 | gen_asm_stdout $abi bn/asm/x86_64-mont.pl bn/mont-$abi-x86_64.S |
282 | gen_asm_stdout $abi bn/asm/x86_64-mont5.pl bn/mont5-$abi-x86_64.S | 282 | 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 | ||
284 | gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S | 283 | gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S |
285 | gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S | 284 | gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S |
286 | done | 285 | done |