aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2024-11-08 09:23:07 -0700
committerTheo Buehler <tb@openbsd.org>2024-11-08 09:29:55 -0700
commit19eef52c711d6ae2d600177bec25d659e371a703 (patch)
tree84b4af530dd4906910ec1d23cba0f6ac15125e2c
parent52b1623c6b4fee563f01ce91d76e2df23ed090c1 (diff)
downloadportable-19eef52c711d6ae2d600177bec25d659e371a703.tar.gz
portable-19eef52c711d6ae2d600177bec25d659e371a703.tar.bz2
portable-19eef52c711d6ae2d600177bec25d659e371a703.zip
Disable sha256 assembly
-rw-r--r--crypto/CMakeLists.txt8
-rw-r--r--crypto/Makefile.am.elf-x86_642
-rw-r--r--crypto/Makefile.am.macosx-x86_642
-rw-r--r--crypto/Makefile.am.masm-x86_642
-rw-r--r--crypto/Makefile.am.mingw64-x86_642
-rwxr-xr-xupdate.sh1
6 files changed, 0 insertions, 17 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index cf85036..86421d0 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -36,7 +36,6 @@ if(HOST_ASM_ELF_X86_64)
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 38 sha/sha1-elf-x86_64.S
39 sha/sha256-elf-x86_64.S
40 sha/sha512-elf-x86_64.S 39 sha/sha512-elf-x86_64.S
41 40
42 bn/arch/amd64/bignum_add.S 41 bn/arch/amd64/bignum_add.S
@@ -62,7 +61,6 @@ if(HOST_ASM_ELF_X86_64)
62 add_definitions(-DGHASH_ASM) 61 add_definitions(-DGHASH_ASM)
63 add_definitions(-DRSA_ASM) 62 add_definitions(-DRSA_ASM)
64 add_definitions(-DSHA1_ASM) 63 add_definitions(-DSHA1_ASM)
65 add_definitions(-DSHA256_ASM)
66 add_definitions(-DSHA512_ASM) 64 add_definitions(-DSHA512_ASM)
67 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) 65 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
68endif() 66endif()
@@ -81,7 +79,6 @@ if(HOST_ASM_MACOSX_X86_64)
81 modes/ghash-macosx-x86_64.S 79 modes/ghash-macosx-x86_64.S
82 rc4/rc4-macosx-x86_64.S 80 rc4/rc4-macosx-x86_64.S
83 sha/sha1-macosx-x86_64.S 81 sha/sha1-macosx-x86_64.S
84 sha/sha256-macosx-x86_64.S
85 sha/sha512-macosx-x86_64.S 82 sha/sha512-macosx-x86_64.S
86 83
87 bn/arch/amd64/bignum_add.S 84 bn/arch/amd64/bignum_add.S
@@ -107,7 +104,6 @@ if(HOST_ASM_MACOSX_X86_64)
107 add_definitions(-DGHASH_ASM) 104 add_definitions(-DGHASH_ASM)
108 add_definitions(-DRSA_ASM) 105 add_definitions(-DRSA_ASM)
109 add_definitions(-DSHA1_ASM) 106 add_definitions(-DSHA1_ASM)
110 add_definitions(-DSHA256_ASM)
111 add_definitions(-DSHA512_ASM) 107 add_definitions(-DSHA512_ASM)
112 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) 108 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
113 set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") 109 set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
@@ -127,7 +123,6 @@ if(HOST_ASM_MASM_X86_64)
127 modes/ghash-masm-x86_64.S 123 modes/ghash-masm-x86_64.S
128 rc4/rc4-masm-x86_64.S 124 rc4/rc4-masm-x86_64.S
129 sha/sha1-masm-x86_64.S 125 sha/sha1-masm-x86_64.S
130 sha/sha256-masm-x86_64.S
131 sha/sha512-masm-x86_64.S 126 sha/sha512-masm-x86_64.S
132 ) 127 )
133 add_definitions(-Dendbr64=) 128 add_definitions(-Dendbr64=)
@@ -141,7 +136,6 @@ if(HOST_ASM_MASM_X86_64)
141 add_definitions(-DGHASH_ASM) 136 add_definitions(-DGHASH_ASM)
142 add_definitions(-DRSA_ASM) 137 add_definitions(-DRSA_ASM)
143 add_definitions(-DSHA1_ASM) 138 add_definitions(-DSHA1_ASM)
144 add_definitions(-DSHA256_ASM)
145 add_definitions(-DSHA512_ASM) 139 add_definitions(-DSHA512_ASM)
146 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) 140 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
147 set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) 141 set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
@@ -161,7 +155,6 @@ if(HOST_ASM_MINGW64_X86_64)
161 modes/ghash-mingw64-x86_64.S 155 modes/ghash-mingw64-x86_64.S
162 rc4/rc4-mingw64-x86_64.S 156 rc4/rc4-mingw64-x86_64.S
163 sha/sha1-mingw64-x86_64.S 157 sha/sha1-mingw64-x86_64.S
164 sha/sha256-mingw64-x86_64.S
165 sha/sha512-mingw64-x86_64.S 158 sha/sha512-mingw64-x86_64.S
166 ) 159 )
167 add_definitions(-Dendbr32=endbr64) 160 add_definitions(-Dendbr32=endbr64)
@@ -175,7 +168,6 @@ if(HOST_ASM_MINGW64_X86_64)
175 add_definitions(-DGHASH_ASM) 168 add_definitions(-DGHASH_ASM)
176 add_definitions(-DRSA_ASM) 169 add_definitions(-DRSA_ASM)
177 add_definitions(-DSHA1_ASM) 170 add_definitions(-DSHA1_ASM)
178 add_definitions(-DSHA256_ASM)
179 add_definitions(-DSHA512_ASM) 171 add_definitions(-DSHA512_ASM)
180 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) 172 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
181endif() 173endif()
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 739fd3f..bb50016 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -10,7 +10,6 @@ ASM_X86_64_ELF += md5/md5-elf-x86_64.S
10ASM_X86_64_ELF += modes/ghash-elf-x86_64.S 10ASM_X86_64_ELF += modes/ghash-elf-x86_64.S
11ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S 11ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
12ASM_X86_64_ELF += sha/sha1-elf-x86_64.S 12ASM_X86_64_ELF += sha/sha1-elf-x86_64.S
13ASM_X86_64_ELF += sha/sha256-elf-x86_64.S
14ASM_X86_64_ELF += sha/sha512-elf-x86_64.S 13ASM_X86_64_ELF += sha/sha512-elf-x86_64.S
15 14
16ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S 15ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S
@@ -39,7 +38,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
39libcrypto_la_CPPFLAGS += -DGHASH_ASM 38libcrypto_la_CPPFLAGS += -DGHASH_ASM
40libcrypto_la_CPPFLAGS += -DRSA_ASM 39libcrypto_la_CPPFLAGS += -DRSA_ASM
41libcrypto_la_CPPFLAGS += -DSHA1_ASM 40libcrypto_la_CPPFLAGS += -DSHA1_ASM
42libcrypto_la_CPPFLAGS += -DSHA256_ASM
43libcrypto_la_CPPFLAGS += -DSHA512_ASM 41libcrypto_la_CPPFLAGS += -DSHA512_ASM
44libcrypto_la_SOURCES += $(ASM_X86_64_ELF) 42libcrypto_la_SOURCES += $(ASM_X86_64_ELF)
45endif 43endif
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index 1095bca..3682a2f 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -10,7 +10,6 @@ ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S
10ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S 10ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S
11ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S 11ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
12ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S 12ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S
13ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S
14ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S 13ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S
15 14
16ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S 15ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S
@@ -39,7 +38,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
39libcrypto_la_CPPFLAGS += -DGHASH_ASM 38libcrypto_la_CPPFLAGS += -DGHASH_ASM
40libcrypto_la_CPPFLAGS += -DRSA_ASM 39libcrypto_la_CPPFLAGS += -DRSA_ASM
41libcrypto_la_CPPFLAGS += -DSHA1_ASM 40libcrypto_la_CPPFLAGS += -DSHA1_ASM
42libcrypto_la_CPPFLAGS += -DSHA256_ASM
43libcrypto_la_CPPFLAGS += -DSHA512_ASM 41libcrypto_la_CPPFLAGS += -DSHA512_ASM
44libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) 42libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX)
45endif 43endif
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64
index fefe2bd..f7e21e1 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -10,7 +10,6 @@ ASM_X86_64_MASM += md5/md5-masm-x86_64.S
10ASM_X86_64_MASM += modes/ghash-masm-x86_64.S 10ASM_X86_64_MASM += modes/ghash-masm-x86_64.S
11ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S 11ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
12ASM_X86_64_MASM += sha/sha1-masm-x86_64.S 12ASM_X86_64_MASM += sha/sha1-masm-x86_64.S
13ASM_X86_64_MASM += sha/sha256-masm-x86_64.S
14ASM_X86_64_MASM += sha/sha512-masm-x86_64.S 13ASM_X86_64_MASM += sha/sha512-masm-x86_64.S
15 14
16EXTRA_DIST += $(ASM_X86_64_MASM) 15EXTRA_DIST += $(ASM_X86_64_MASM)
@@ -26,7 +25,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
26libcrypto_la_CPPFLAGS += -DGHASH_ASM 25libcrypto_la_CPPFLAGS += -DGHASH_ASM
27libcrypto_la_CPPFLAGS += -DRSA_ASM 26libcrypto_la_CPPFLAGS += -DRSA_ASM
28libcrypto_la_CPPFLAGS += -DSHA1_ASM 27libcrypto_la_CPPFLAGS += -DSHA1_ASM
29libcrypto_la_CPPFLAGS += -DSHA256_ASM
30libcrypto_la_CPPFLAGS += -DSHA512_ASM 28libcrypto_la_CPPFLAGS += -DSHA512_ASM
31libcrypto_la_SOURCES += $(ASM_X86_64_MASM) 29libcrypto_la_SOURCES += $(ASM_X86_64_MASM)
32endif 30endif
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64
index 1470d4a..61b5660 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -10,7 +10,6 @@ ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S
10ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S 10ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S
11ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S 11ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
12ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S 12ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S
13ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S
14ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S 13ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S
15 14
16EXTRA_DIST += $(ASM_X86_64_MINGW64) 15EXTRA_DIST += $(ASM_X86_64_MINGW64)
@@ -27,7 +26,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
27libcrypto_la_CPPFLAGS += -DGHASH_ASM 26libcrypto_la_CPPFLAGS += -DGHASH_ASM
28libcrypto_la_CPPFLAGS += -DRSA_ASM 27libcrypto_la_CPPFLAGS += -DRSA_ASM
29libcrypto_la_CPPFLAGS += -DSHA1_ASM 28libcrypto_la_CPPFLAGS += -DSHA1_ASM
30libcrypto_la_CPPFLAGS += -DSHA256_ASM
31libcrypto_la_CPPFLAGS += -DSHA512_ASM 29libcrypto_la_CPPFLAGS += -DSHA512_ASM
32libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) 30libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64)
33endif 31endif
diff --git a/update.sh b/update.sh
index 8fdae9d..896c1e7 100755
--- a/update.sh
+++ b/update.sh
@@ -284,7 +284,6 @@ for abi in elf macosx masm mingw64; do
284 gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S 284 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 285 gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S
286 gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S 286 gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S
287 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha256-$abi-x86_64.S
288 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S 287 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S
289done 288done
290 289