From 1a6640329d4d72343cd85fd156e4800c9d2e93ba Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Sat, 15 Apr 2023 13:38:01 -0600 Subject: Drop GF2m assembly --- crypto/CMakeLists.txt | 10 ---------- crypto/Makefile.am.elf-arm | 2 -- 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 -- 6 files changed, 20 deletions(-) (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 525c5fd..7afbc98 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -4,7 +4,6 @@ if(HOST_ASM_ELF_ARMV4) set( ASM_ARMV4_ELF_SRC aes/aes-elf-armv4.S - bn/gf2m-elf-armv4.S bn/mont-elf-armv4.S sha/sha1-elf-armv4.S sha/sha512-elf-armv4.S @@ -15,7 +14,6 @@ if(HOST_ASM_ELF_ARMV4) ) add_definitions(-DAES_ASM) add_definitions(-DOPENSSL_BN_ASM_MONT) - add_definitions(-DOPENSSL_BN_ASM_GF2m) add_definitions(-DGHASH_ASM) add_definitions(-DSHA1_ASM) add_definitions(-DSHA256_ASM) @@ -36,7 +34,6 @@ if(HOST_ASM_ELF_X86_64) bn/modexp512-elf-x86_64.S bn/mont-elf-x86_64.S bn/mont5-elf-x86_64.S - bn/gf2m-elf-x86_64.S camellia/cmll-elf-x86_64.S md5/md5-elf-x86_64.S modes/ghash-elf-x86_64.S @@ -67,7 +64,6 @@ if(HOST_ASM_ELF_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) add_definitions(-DOPENSSL_BN_ASM_MONT) add_definitions(-DOPENSSL_BN_ASM_MONT5) - add_definitions(-DOPENSSL_BN_ASM_GF2m) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) @@ -91,7 +87,6 @@ if(HOST_ASM_MACOSX_X86_64) bn/modexp512-macosx-x86_64.S bn/mont-macosx-x86_64.S bn/mont5-macosx-x86_64.S - bn/gf2m-macosx-x86_64.S camellia/cmll-macosx-x86_64.S md5/md5-macosx-x86_64.S modes/ghash-macosx-x86_64.S @@ -122,7 +117,6 @@ if(HOST_ASM_MACOSX_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) add_definitions(-DOPENSSL_BN_ASM_MONT) add_definitions(-DOPENSSL_BN_ASM_MONT5) - add_definitions(-DOPENSSL_BN_ASM_GF2m) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) @@ -147,7 +141,6 @@ if(HOST_ASM_MASM_X86_64) #bn/modexp512-masm-x86_64.S #bn/mont-masm-x86_64.S #bn/mont5-masm-x86_64.S - #bn/gf2m-masm-x86_64.S camellia/cmll-masm-x86_64.S md5/md5-masm-x86_64.S modes/ghash-masm-x86_64.S @@ -165,7 +158,6 @@ if(HOST_ASM_MASM_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) #add_definitions(-DOPENSSL_BN_ASM_MONT) #add_definitions(-DOPENSSL_BN_ASM_MONT5) - #add_definitions(-DOPENSSL_BN_ASM_GF2m) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) @@ -189,7 +181,6 @@ if(HOST_ASM_MINGW64_X86_64) #bn/modexp512-mingw64-x86_64.S #bn/mont-mingw64-x86_64.S #bn/mont5-mingw64-x86_64.S - #bn/gf2m-mingw64-x86_64.S camellia/cmll-mingw64-x86_64.S md5/md5-mingw64-x86_64.S modes/ghash-mingw64-x86_64.S @@ -207,7 +198,6 @@ if(HOST_ASM_MINGW64_X86_64) add_definitions(-DOPENSSL_IA32_SSE2) #add_definitions(-DOPENSSL_BN_ASM_MONT) #add_definitions(-DOPENSSL_BN_ASM_MONT5) - #add_definitions(-DOPENSSL_BN_ASM_GF2m) add_definitions(-DMD5_ASM) add_definitions(-DGHASH_ASM) add_definitions(-DRSA_ASM) diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm index a77c4d3..041c27c 100644 --- a/crypto/Makefile.am.elf-arm +++ b/crypto/Makefile.am.elf-arm @@ -1,5 +1,4 @@ ASM_ARM_ELF = aes/aes-elf-armv4.S -ASM_ARM_ELF += bn/gf2m-elf-armv4.S ASM_ARM_ELF += bn/mont-elf-armv4.S ASM_ARM_ELF += sha/sha1-elf-armv4.S ASM_ARM_ELF += sha/sha512-elf-armv4.S @@ -20,7 +19,6 @@ EXTRA_DIST += $(ASM_ARM_ELF) if HOST_ASM_ELF_ARM libcrypto_la_CPPFLAGS += -DAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT -libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DSHA1_ASM libcrypto_la_CPPFLAGS += -DSHA256_ASM diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index 20cc0cc..88be1d5 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -7,7 +7,6 @@ ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.S ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S ASM_X86_64_ELF += bn/mont-elf-x86_64.S ASM_X86_64_ELF += bn/mont5-elf-x86_64.S -ASM_X86_64_ELF += bn/gf2m-elf-x86_64.S ASM_X86_64_ELF += camellia/cmll-elf-x86_64.S ASM_X86_64_ELF += md5/md5-elf-x86_64.S ASM_X86_64_ELF += modes/ghash-elf-x86_64.S @@ -41,7 +40,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index f3990a5..b9b89cf 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -7,7 +7,6 @@ ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.S ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S -ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.S ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.S ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S @@ -41,7 +40,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index 27094c0..b914cb6 100644 --- a/crypto/Makefile.am.masm-x86_64 +++ b/crypto/Makefile.am.masm-x86_64 @@ -7,7 +7,6 @@ ASM_X86_64_MASM += aes/aesni-sha1-masm-x86_64.S ASM_X86_64_MASM += bn/modexp512-masm-x86_64.S ASM_X86_64_MASM += bn/mont-masm-x86_64.S ASM_X86_64_MASM += bn/mont5-masm-x86_64.S -ASM_X86_64_MASM += bn/gf2m-masm-x86_64.S ASM_X86_64_MASM += camellia/cmll-masm-x86_64.S ASM_X86_64_MASM += md5/md5-masm-x86_64.S ASM_X86_64_MASM += modes/ghash-masm-x86_64.S @@ -28,7 +27,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index bce854b..5a277c5 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 @@ -7,7 +7,6 @@ ASM_X86_64_MINGW64 += aes/aesni-sha1-mingw64-x86_64.S #ASM_X86_64_MINGW64 += bn/modexp512-mingw64-x86_64.S #ASM_X86_64_MINGW64 += bn/mont-mingw64-x86_64.S #ASM_X86_64_MINGW64 += bn/mont5-mingw64-x86_64.S -#ASM_X86_64_MINGW64 += bn/gf2m-mingw64-x86_64.S ASM_X86_64_MINGW64 += camellia/cmll-mingw64-x86_64.S ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S @@ -28,7 +27,6 @@ libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 -#libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m libcrypto_la_CPPFLAGS += -DMD5_ASM libcrypto_la_CPPFLAGS += -DGHASH_ASM libcrypto_la_CPPFLAGS += -DRSA_ASM -- cgit v1.2.3-55-g6feb