From 694d8698545178cc26701ebfe1c113e2db237ab5 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 4 Dec 2024 20:06:10 -0700 Subject: Disable sha1 assembly on amd64 --- crypto/CMakeLists.txt | 8 -------- crypto/Makefile.am.elf-x86_64 | 2 -- crypto/Makefile.am.macosx-x86_64 | 2 -- crypto/Makefile.am.masm-x86_64 | 2 -- crypto/Makefile.am.mingw64-x86_64 | 2 -- update.sh | 1 - 6 files changed, 17 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) md5/md5-elf-x86_64.S modes/ghash-elf-x86_64.S rc4/rc4-elf-x86_64.S - sha/sha1-elf-x86_64.S bn/arch/amd64/bignum_add.S bn/arch/amd64/bignum_cmadd.S @@ -59,7 +58,6 @@ if(HOST_ASM_ELF_X86_64) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) - add_definitions(-DSHA1_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) endif() @@ -76,7 +74,6 @@ if(HOST_ASM_MACOSX_X86_64) md5/md5-macosx-x86_64.S modes/ghash-macosx-x86_64.S rc4/rc4-macosx-x86_64.S - sha/sha1-macosx-x86_64.S bn/arch/amd64/bignum_add.S bn/arch/amd64/bignum_cmadd.S @@ -100,7 +97,6 @@ if(HOST_ASM_MACOSX_X86_64) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) - add_definitions(-DSHA1_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") endif() @@ -118,7 +114,6 @@ if(HOST_ASM_MASM_X86_64) md5/md5-masm-x86_64.S modes/ghash-masm-x86_64.S rc4/rc4-masm-x86_64.S - sha/sha1-masm-x86_64.S ) add_definitions(-Dendbr64=) add_definitions(-DAES_ASM) @@ -130,7 +125,6 @@ if(HOST_ASM_MASM_X86_64) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) - add_definitions(-DSHA1_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) endif() @@ -148,7 +142,6 @@ if(HOST_ASM_MINGW64_X86_64) md5/md5-mingw64-x86_64.S modes/ghash-mingw64-x86_64.S rc4/rc4-mingw64-x86_64.S - sha/sha1-mingw64-x86_64.S ) add_definitions(-Dendbr32=endbr64) add_definitions(-DAES_ASM) @@ -160,7 +153,6 @@ if(HOST_ASM_MINGW64_X86_64) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) - add_definitions(-DSHA1_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) endif() 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 ASM_X86_64_ELF += md5/md5-elf-x86_64.S ASM_X86_64_ELF += modes/ghash-elf-x86_64.S ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S -ASM_X86_64_ELF += sha/sha1-elf-x86_64.S ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S @@ -36,6 +35,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM -libcrypto_la_CPPFLAGS += -DSHA1_ASM libcrypto_la_SOURCES += $(ASM_X86_64_ELF) 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 ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S -ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S @@ -36,6 +35,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM -libcrypto_la_CPPFLAGS += -DSHA1_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) 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 ASM_X86_64_MASM += md5/md5-masm-x86_64.S ASM_X86_64_MASM += modes/ghash-masm-x86_64.S ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S -ASM_X86_64_MASM += sha/sha1-masm-x86_64.S EXTRA_DIST += $(ASM_X86_64_MASM) @@ -23,6 +22,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM -libcrypto_la_CPPFLAGS += -DSHA1_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MASM) 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 ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S -ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S EXTRA_DIST += $(ASM_X86_64_MINGW64) @@ -24,6 +23,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM -libcrypto_la_CPPFLAGS += -DSHA1_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) endif diff --git a/update.sh b/update.sh index e1d9e86..729c65a 100755 --- a/update.sh +++ b/update.sh @@ -283,7 +283,6 @@ for abi in elf macosx masm mingw64; do gen_asm_stdout $abi md5/asm/md5-x86_64.pl md5/md5-$abi-x86_64.S gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S - gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S done # copy libtls source -- cgit v1.2.3-55-g6feb