diff options
author | Theo Buehler <tb@openbsd.org> | 2024-12-04 20:06:10 -0700 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2024-12-04 20:06:10 -0700 |
commit | 694d8698545178cc26701ebfe1c113e2db237ab5 (patch) | |
tree | fd172263324d7dd79454fd9155bbb7122d723ef2 /crypto | |
parent | f843a3441b2ffb662474cb3a7c17889423bcad99 (diff) | |
download | portable-694d8698545178cc26701ebfe1c113e2db237ab5.tar.gz portable-694d8698545178cc26701ebfe1c113e2db237ab5.tar.bz2 portable-694d8698545178cc26701ebfe1c113e2db237ab5.zip |
Disable sha1 assembly on amd64
Diffstat (limited to 'crypto')
-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 |
5 files changed, 0 insertions, 16 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index b281716..f9ac149 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -35,7 +35,6 @@ if(HOST_ASM_ELF_X86_64) | |||
35 | md5/md5-elf-x86_64.S | 35 | md5/md5-elf-x86_64.S |
36 | modes/ghash-elf-x86_64.S | 36 | modes/ghash-elf-x86_64.S |
37 | rc4/rc4-elf-x86_64.S | 37 | rc4/rc4-elf-x86_64.S |
38 | sha/sha1-elf-x86_64.S | ||
39 | 38 | ||
40 | bn/arch/amd64/bignum_add.S | 39 | bn/arch/amd64/bignum_add.S |
41 | bn/arch/amd64/bignum_cmadd.S | 40 | bn/arch/amd64/bignum_cmadd.S |
@@ -59,7 +58,6 @@ if(HOST_ASM_ELF_X86_64) | |||
59 | add_definitions(-DMD5_ASM) | 58 | add_definitions(-DMD5_ASM) |
60 | add_definitions(-DGHASH_ASM) | 59 | add_definitions(-DGHASH_ASM) |
61 | add_definitions(-DRSA_ASM) | 60 | add_definitions(-DRSA_ASM) |
62 | add_definitions(-DSHA1_ASM) | ||
63 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) | 61 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) |
64 | endif() | 62 | endif() |
65 | 63 | ||
@@ -76,7 +74,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
76 | md5/md5-macosx-x86_64.S | 74 | md5/md5-macosx-x86_64.S |
77 | modes/ghash-macosx-x86_64.S | 75 | modes/ghash-macosx-x86_64.S |
78 | rc4/rc4-macosx-x86_64.S | 76 | rc4/rc4-macosx-x86_64.S |
79 | sha/sha1-macosx-x86_64.S | ||
80 | 77 | ||
81 | bn/arch/amd64/bignum_add.S | 78 | bn/arch/amd64/bignum_add.S |
82 | bn/arch/amd64/bignum_cmadd.S | 79 | bn/arch/amd64/bignum_cmadd.S |
@@ -100,7 +97,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
100 | add_definitions(-DMD5_ASM) | 97 | add_definitions(-DMD5_ASM) |
101 | add_definitions(-DGHASH_ASM) | 98 | add_definitions(-DGHASH_ASM) |
102 | add_definitions(-DRSA_ASM) | 99 | add_definitions(-DRSA_ASM) |
103 | add_definitions(-DSHA1_ASM) | ||
104 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) | 100 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) |
105 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") | 101 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") |
106 | endif() | 102 | endif() |
@@ -118,7 +114,6 @@ if(HOST_ASM_MASM_X86_64) | |||
118 | md5/md5-masm-x86_64.S | 114 | md5/md5-masm-x86_64.S |
119 | modes/ghash-masm-x86_64.S | 115 | modes/ghash-masm-x86_64.S |
120 | rc4/rc4-masm-x86_64.S | 116 | rc4/rc4-masm-x86_64.S |
121 | sha/sha1-masm-x86_64.S | ||
122 | ) | 117 | ) |
123 | add_definitions(-Dendbr64=) | 118 | add_definitions(-Dendbr64=) |
124 | add_definitions(-DAES_ASM) | 119 | add_definitions(-DAES_ASM) |
@@ -130,7 +125,6 @@ if(HOST_ASM_MASM_X86_64) | |||
130 | add_definitions(-DMD5_ASM) | 125 | add_definitions(-DMD5_ASM) |
131 | add_definitions(-DGHASH_ASM) | 126 | add_definitions(-DGHASH_ASM) |
132 | add_definitions(-DRSA_ASM) | 127 | add_definitions(-DRSA_ASM) |
133 | add_definitions(-DSHA1_ASM) | ||
134 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) | 128 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) |
135 | set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) | 129 | set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) |
136 | endif() | 130 | endif() |
@@ -148,7 +142,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
148 | md5/md5-mingw64-x86_64.S | 142 | md5/md5-mingw64-x86_64.S |
149 | modes/ghash-mingw64-x86_64.S | 143 | modes/ghash-mingw64-x86_64.S |
150 | rc4/rc4-mingw64-x86_64.S | 144 | rc4/rc4-mingw64-x86_64.S |
151 | sha/sha1-mingw64-x86_64.S | ||
152 | ) | 145 | ) |
153 | add_definitions(-Dendbr32=endbr64) | 146 | add_definitions(-Dendbr32=endbr64) |
154 | add_definitions(-DAES_ASM) | 147 | add_definitions(-DAES_ASM) |
@@ -160,7 +153,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
160 | add_definitions(-DMD5_ASM) | 153 | add_definitions(-DMD5_ASM) |
161 | add_definitions(-DGHASH_ASM) | 154 | add_definitions(-DGHASH_ASM) |
162 | add_definitions(-DRSA_ASM) | 155 | add_definitions(-DRSA_ASM) |
163 | add_definitions(-DSHA1_ASM) | ||
164 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) | 156 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) |
165 | endif() | 157 | endif() |
166 | 158 | ||
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index a89a55b..6feeb91 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 | |||
@@ -9,7 +9,6 @@ ASM_X86_64_ELF += bn/mont5-elf-x86_64.S | |||
9 | ASM_X86_64_ELF += md5/md5-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 | 10 | ASM_X86_64_ELF += modes/ghash-elf-x86_64.S |
11 | ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S | 11 | ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S |
12 | ASM_X86_64_ELF += sha/sha1-elf-x86_64.S | ||
13 | 12 | ||
14 | ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S | 13 | ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S |
15 | ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S | 14 | ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S |
@@ -36,6 +35,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | |||
36 | libcrypto_la_CPPFLAGS += -DMD5_ASM | 35 | libcrypto_la_CPPFLAGS += -DMD5_ASM |
37 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 36 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
38 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 37 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
39 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | ||
40 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) | 38 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) |
41 | endif | 39 | endif |
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index 4050b47..d9df49a 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 | |||
@@ -9,7 +9,6 @@ ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S | |||
9 | ASM_X86_64_MACOSX += md5/md5-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 | 10 | ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S |
11 | ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S | 11 | ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S |
12 | ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S | ||
13 | 12 | ||
14 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S | 13 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S |
15 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S | 14 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S |
@@ -36,6 +35,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | |||
36 | libcrypto_la_CPPFLAGS += -DMD5_ASM | 35 | libcrypto_la_CPPFLAGS += -DMD5_ASM |
37 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 36 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
38 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 37 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
39 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | ||
40 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) | 38 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) |
41 | endif | 39 | endif |
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index c4b35b2..90641a7 100644 --- a/crypto/Makefile.am.masm-x86_64 +++ b/crypto/Makefile.am.masm-x86_64 | |||
@@ -9,7 +9,6 @@ ASM_X86_64_MASM += bn/mont5-masm-x86_64.S | |||
9 | ASM_X86_64_MASM += md5/md5-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 | 10 | ASM_X86_64_MASM += modes/ghash-masm-x86_64.S |
11 | ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S | 11 | ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S |
12 | ASM_X86_64_MASM += sha/sha1-masm-x86_64.S | ||
13 | 12 | ||
14 | EXTRA_DIST += $(ASM_X86_64_MASM) | 13 | EXTRA_DIST += $(ASM_X86_64_MASM) |
15 | 14 | ||
@@ -23,6 +22,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 | |||
23 | libcrypto_la_CPPFLAGS += -DMD5_ASM | 22 | libcrypto_la_CPPFLAGS += -DMD5_ASM |
24 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 23 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
25 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 24 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
26 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | ||
27 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) | 25 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) |
28 | endif | 26 | endif |
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index 744d7c0..ec40b9e 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 | |||
@@ -9,7 +9,6 @@ ASM_X86_64_MINGW64 += aes/aesni-mingw64-x86_64.S | |||
9 | ASM_X86_64_MINGW64 += md5/md5-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 | 10 | ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S |
11 | ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S | 11 | ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S |
12 | ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S | ||
13 | 12 | ||
14 | EXTRA_DIST += $(ASM_X86_64_MINGW64) | 13 | EXTRA_DIST += $(ASM_X86_64_MINGW64) |
15 | 14 | ||
@@ -24,6 +23,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 | |||
24 | libcrypto_la_CPPFLAGS += -DMD5_ASM | 23 | libcrypto_la_CPPFLAGS += -DMD5_ASM |
25 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 24 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
26 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 25 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
27 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | ||
28 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) | 26 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) |
29 | endif | 27 | endif |