diff options
| author | Theo Buehler <tb@openbsd.org> | 2024-11-16 08:20:29 -0700 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2024-11-16 08:20:29 -0700 |
| commit | 8de367893bf8198d0959d4fabed9847b90209ae0 (patch) | |
| tree | 7a3298fc5811d22fa26413d0467911451b7a7497 | |
| parent | c94f43184cdbbd6fee53e1603356cc218f8ff663 (diff) | |
| download | portable-8de367893bf8198d0959d4fabed9847b90209ae0.tar.gz portable-8de367893bf8198d0959d4fabed9847b90209ae0.tar.bz2 portable-8de367893bf8198d0959d4fabed9847b90209ae0.zip | |
Disable sha512 perlasm
| -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 31a0d62..b281716 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/sha512-elf-x86_64.S | ||
| 40 | 39 | ||
| 41 | bn/arch/amd64/bignum_add.S | 40 | bn/arch/amd64/bignum_add.S |
| 42 | bn/arch/amd64/bignum_cmadd.S | 41 | bn/arch/amd64/bignum_cmadd.S |
| @@ -61,7 +60,6 @@ if(HOST_ASM_ELF_X86_64) | |||
| 61 | add_definitions(-DGHASH_ASM) | 60 | add_definitions(-DGHASH_ASM) |
| 62 | add_definitions(-DRSA_ASM) | 61 | add_definitions(-DRSA_ASM) |
| 63 | add_definitions(-DSHA1_ASM) | 62 | add_definitions(-DSHA1_ASM) |
| 64 | add_definitions(-DSHA512_ASM) | ||
| 65 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) | 63 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) |
| 66 | endif() | 64 | endif() |
| 67 | 65 | ||
| @@ -79,7 +77,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
| 79 | modes/ghash-macosx-x86_64.S | 77 | modes/ghash-macosx-x86_64.S |
| 80 | rc4/rc4-macosx-x86_64.S | 78 | rc4/rc4-macosx-x86_64.S |
| 81 | sha/sha1-macosx-x86_64.S | 79 | sha/sha1-macosx-x86_64.S |
| 82 | sha/sha512-macosx-x86_64.S | ||
| 83 | 80 | ||
| 84 | bn/arch/amd64/bignum_add.S | 81 | bn/arch/amd64/bignum_add.S |
| 85 | bn/arch/amd64/bignum_cmadd.S | 82 | bn/arch/amd64/bignum_cmadd.S |
| @@ -104,7 +101,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
| 104 | add_definitions(-DGHASH_ASM) | 101 | add_definitions(-DGHASH_ASM) |
| 105 | add_definitions(-DRSA_ASM) | 102 | add_definitions(-DRSA_ASM) |
| 106 | add_definitions(-DSHA1_ASM) | 103 | add_definitions(-DSHA1_ASM) |
| 107 | add_definitions(-DSHA512_ASM) | ||
| 108 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) | 104 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) |
| 109 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") | 105 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") |
| 110 | endif() | 106 | endif() |
| @@ -123,7 +119,6 @@ if(HOST_ASM_MASM_X86_64) | |||
| 123 | modes/ghash-masm-x86_64.S | 119 | modes/ghash-masm-x86_64.S |
| 124 | rc4/rc4-masm-x86_64.S | 120 | rc4/rc4-masm-x86_64.S |
| 125 | sha/sha1-masm-x86_64.S | 121 | sha/sha1-masm-x86_64.S |
| 126 | sha/sha512-masm-x86_64.S | ||
| 127 | ) | 122 | ) |
| 128 | add_definitions(-Dendbr64=) | 123 | add_definitions(-Dendbr64=) |
| 129 | add_definitions(-DAES_ASM) | 124 | add_definitions(-DAES_ASM) |
| @@ -136,7 +131,6 @@ if(HOST_ASM_MASM_X86_64) | |||
| 136 | add_definitions(-DGHASH_ASM) | 131 | add_definitions(-DGHASH_ASM) |
| 137 | add_definitions(-DRSA_ASM) | 132 | add_definitions(-DRSA_ASM) |
| 138 | add_definitions(-DSHA1_ASM) | 133 | add_definitions(-DSHA1_ASM) |
| 139 | add_definitions(-DSHA512_ASM) | ||
| 140 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) | 134 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) |
| 141 | set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) | 135 | set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) |
| 142 | endif() | 136 | endif() |
| @@ -155,7 +149,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
| 155 | modes/ghash-mingw64-x86_64.S | 149 | modes/ghash-mingw64-x86_64.S |
| 156 | rc4/rc4-mingw64-x86_64.S | 150 | rc4/rc4-mingw64-x86_64.S |
| 157 | sha/sha1-mingw64-x86_64.S | 151 | sha/sha1-mingw64-x86_64.S |
| 158 | sha/sha512-mingw64-x86_64.S | ||
| 159 | ) | 152 | ) |
| 160 | add_definitions(-Dendbr32=endbr64) | 153 | add_definitions(-Dendbr32=endbr64) |
| 161 | add_definitions(-DAES_ASM) | 154 | add_definitions(-DAES_ASM) |
| @@ -168,7 +161,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
| 168 | add_definitions(-DGHASH_ASM) | 161 | add_definitions(-DGHASH_ASM) |
| 169 | add_definitions(-DRSA_ASM) | 162 | add_definitions(-DRSA_ASM) |
| 170 | add_definitions(-DSHA1_ASM) | 163 | add_definitions(-DSHA1_ASM) |
| 171 | add_definitions(-DSHA512_ASM) | ||
| 172 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) | 164 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) |
| 173 | endif() | 165 | endif() |
| 174 | 166 | ||
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index bb50016..a89a55b 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 | |||
| 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 | 12 | ASM_X86_64_ELF += sha/sha1-elf-x86_64.S |
| 13 | ASM_X86_64_ELF += sha/sha512-elf-x86_64.S | ||
| 14 | 13 | ||
| 15 | ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S | 14 | ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S |
| 16 | ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S | 15 | ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S |
| @@ -38,6 +37,5 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM | |||
| 38 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 37 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
| 39 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 38 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
| 40 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | 39 | libcrypto_la_CPPFLAGS += -DSHA1_ASM |
| 41 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | ||
| 42 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) | 40 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) |
| 43 | endif | 41 | endif |
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index 3682a2f..4050b47 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 | |||
| 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 | 12 | ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S |
| 13 | ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S | ||
| 14 | 13 | ||
| 15 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S | 14 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S |
| 16 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S | 15 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S |
| @@ -38,6 +37,5 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM | |||
| 38 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 37 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
| 39 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 38 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
| 40 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | 39 | libcrypto_la_CPPFLAGS += -DSHA1_ASM |
| 41 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | ||
| 42 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) | 40 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) |
| 43 | endif | 41 | endif |
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index f7e21e1..c4b35b2 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 | |||
| 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 | 12 | ASM_X86_64_MASM += sha/sha1-masm-x86_64.S |
| 13 | ASM_X86_64_MASM += sha/sha512-masm-x86_64.S | ||
| 14 | 13 | ||
| 15 | EXTRA_DIST += $(ASM_X86_64_MASM) | 14 | EXTRA_DIST += $(ASM_X86_64_MASM) |
| 16 | 15 | ||
| @@ -25,6 +24,5 @@ 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 | 26 | libcrypto_la_CPPFLAGS += -DSHA1_ASM |
| 28 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | ||
| 29 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) | 27 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) |
| 30 | endif | 28 | endif |
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index 61b5660..744d7c0 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 | |||
| 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 | 12 | ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S |
| 13 | ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S | ||
| 14 | 13 | ||
| 15 | EXTRA_DIST += $(ASM_X86_64_MINGW64) | 14 | EXTRA_DIST += $(ASM_X86_64_MINGW64) |
| 16 | 15 | ||
| @@ -26,6 +25,5 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM | |||
| 26 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | 25 | libcrypto_la_CPPFLAGS += -DGHASH_ASM |
| 27 | libcrypto_la_CPPFLAGS += -DRSA_ASM | 26 | libcrypto_la_CPPFLAGS += -DRSA_ASM |
| 28 | libcrypto_la_CPPFLAGS += -DSHA1_ASM | 27 | libcrypto_la_CPPFLAGS += -DSHA1_ASM |
| 29 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | ||
| 30 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) | 28 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) |
| 31 | endif | 29 | endif |
| @@ -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/sha512-$abi-x86_64.S | ||
| 288 | done | 287 | done |
| 289 | 288 | ||
| 290 | # copy libtls source | 289 | # copy libtls source |
