From 19eef52c711d6ae2d600177bec25d659e371a703 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Fri, 8 Nov 2024 09:23:07 -0700 Subject: [PATCH] Disable sha256 assembly --- 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 cf850367d0..86421d0a3d 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -36,7 +36,6 @@ if(HOST_ASM_ELF_X86_64) modes/ghash-elf-x86_64.S rc4/rc4-elf-x86_64.S sha/sha1-elf-x86_64.S - sha/sha256-elf-x86_64.S sha/sha512-elf-x86_64.S bn/arch/amd64/bignum_add.S @@ -62,7 +61,6 @@ if(HOST_ASM_ELF_X86_64) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) add_definitions(-DSHA1_ASM) - add_definitions(-DSHA256_ASM) add_definitions(-DSHA512_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) endif() @@ -81,7 +79,6 @@ if(HOST_ASM_MACOSX_X86_64) modes/ghash-macosx-x86_64.S rc4/rc4-macosx-x86_64.S sha/sha1-macosx-x86_64.S - sha/sha256-macosx-x86_64.S sha/sha512-macosx-x86_64.S bn/arch/amd64/bignum_add.S @@ -107,7 +104,6 @@ if(HOST_ASM_MACOSX_X86_64) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) add_definitions(-DSHA1_ASM) - add_definitions(-DSHA256_ASM) add_definitions(-DSHA512_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") @@ -127,7 +123,6 @@ if(HOST_ASM_MASM_X86_64) modes/ghash-masm-x86_64.S rc4/rc4-masm-x86_64.S sha/sha1-masm-x86_64.S - sha/sha256-masm-x86_64.S sha/sha512-masm-x86_64.S ) add_definitions(-Dendbr64=) @@ -141,7 +136,6 @@ if(HOST_ASM_MASM_X86_64) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) add_definitions(-DSHA1_ASM) - add_definitions(-DSHA256_ASM) add_definitions(-DSHA512_ASM) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) @@ -161,7 +155,6 @@ if(HOST_ASM_MINGW64_X86_64) modes/ghash-mingw64-x86_64.S rc4/rc4-mingw64-x86_64.S sha/sha1-mingw64-x86_64.S - sha/sha256-mingw64-x86_64.S sha/sha512-mingw64-x86_64.S ) add_definitions(-Dendbr32=endbr64) @@ -175,7 +168,6 @@ if(HOST_ASM_MINGW64_X86_64) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) add_definitions(-DSHA1_ASM) - add_definitions(-DSHA256_ASM) add_definitions(-DSHA512_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 739fd3feee..bb50016525 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 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 += sha/sha256-elf-x86_64.S ASM_X86_64_ELF += sha/sha512-elf-x86_64.S ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S @@ -39,7 +38,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_CPPFLAGS += -DSHA1_ASM -libcrypto_la_CPPFLAGS += -DSHA256_ASM libcrypto_la_CPPFLAGS += -DSHA512_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 1095bcadac..3682a2fe99 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 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 += sha/sha256-macosx-x86_64.S ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S @@ -39,7 +38,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_CPPFLAGS += -DSHA1_ASM -libcrypto_la_CPPFLAGS += -DSHA256_ASM libcrypto_la_CPPFLAGS += -DSHA512_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 fefe2bd388..f7e21e1c2a 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 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 -ASM_X86_64_MASM += sha/sha256-masm-x86_64.S ASM_X86_64_MASM += sha/sha512-masm-x86_64.S EXTRA_DIST += $(ASM_X86_64_MASM) @@ -26,7 +25,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_CPPFLAGS += -DSHA1_ASM -libcrypto_la_CPPFLAGS += -DSHA256_ASM libcrypto_la_CPPFLAGS += -DSHA512_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 1470d4aebc..61b5660463 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 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 -ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S EXTRA_DIST += $(ASM_X86_64_MINGW64) @@ -27,7 +26,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM libcrypto_la_CPPFLAGS += -DSHA1_ASM -libcrypto_la_CPPFLAGS += -DSHA256_ASM libcrypto_la_CPPFLAGS += -DSHA512_ASM libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) endif diff --git a/update.sh b/update.sh index 8fdae9de8a..896c1e7156 100755 --- a/update.sh +++ b/update.sh @@ -284,7 +284,6 @@ for abi in elf macosx masm mingw64; do 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 - gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha256-$abi-x86_64.S gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S done