From 608555130e8abe649a6132e031dafd97e11f48b7 Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Sat, 17 Jan 2026 00:15:13 +1100 Subject: [PATCH] Mop up various defines that are no longer used upstream BSAES_ASM, VPAES_ASM and OPENSSL_IA32_SSE2 were retired a while ago. --- crypto/CMakeLists.txt | 12 ------------ crypto/Makefile.am.elf-x86_64 | 3 --- crypto/Makefile.am.macosx-x86_64 | 3 --- crypto/Makefile.am.masm-x86_64 | 3 --- crypto/Makefile.am.mingw64-x86_64 | 3 --- 5 files changed, 24 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 137cf70..cb28fc3 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -53,9 +53,6 @@ if(HOST_ASM_ELF_X86_64) bn/arch/amd64/word_clz.S ) add_definitions(-DAES_ASM) - add_definitions(-DBSAES_ASM) - add_definitions(-DVPAES_ASM) - add_definitions(-DOPENSSL_IA32_SSE2) add_definitions(-DOPENSSL_BN_ASM_MONT) add_definitions(-DOPENSSL_BN_ASM_MONT5) add_definitions(-DGHASH_ASM) @@ -101,9 +98,6 @@ if(HOST_ASM_MACOSX_X86_64) bn/arch/amd64/word_clz.S ) add_definitions(-DAES_ASM) - add_definitions(-DBSAES_ASM) - add_definitions(-DVPAES_ASM) - add_definitions(-DOPENSSL_IA32_SSE2) add_definitions(-DOPENSSL_BN_ASM_MONT) add_definitions(-DOPENSSL_BN_ASM_MONT5) add_definitions(-DGHASH_ASM) @@ -128,9 +122,6 @@ if(HOST_ASM_MASM_X86_64) ) add_definitions(-Dendbr64=) add_definitions(-DAES_ASM) - add_definitions(-DBSAES_ASM) - add_definitions(-DVPAES_ASM) - add_definitions(-DOPENSSL_IA32_SSE2) #add_definitions(-DOPENSSL_BN_ASM_MONT) #add_definitions(-DOPENSSL_BN_ASM_MONT5) add_definitions(-DGHASH_ASM) @@ -155,9 +146,6 @@ if(HOST_ASM_MINGW64_X86_64) ) add_definitions(-Dendbr32=endbr64) add_definitions(-DAES_ASM) - add_definitions(-DBSAES_ASM) - add_definitions(-DVPAES_ASM) - add_definitions(-DOPENSSL_IA32_SSE2) #add_definitions(-DOPENSSL_BN_ASM_MONT) #add_definitions(-DOPENSSL_BN_ASM_MONT5) add_definitions(-DGHASH_ASM) diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index df67ad2..c85deb1 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -37,9 +37,6 @@ libcrypto_la_SOURCES += bn/arch/amd64/bn_arch.c libcrypto_la_SOURCES += modes/gcm128_amd64.c libcrypto_la_CPPFLAGS += -DAES_ASM -libcrypto_la_CPPFLAGS += -DBSAES_ASM -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 += -DGHASH_ASM diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index 23e27e6..7fa38ab 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -37,9 +37,6 @@ libcrypto_la_SOURCES += bn/arch/amd64/bn_arch.c libcrypto_la_SOURCES += modes/gcm128_amd64.c libcrypto_la_CPPFLAGS += -DAES_ASM -libcrypto_la_CPPFLAGS += -DBSAES_ASM -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 += -DGHASH_ASM diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index bb94e3a..b24df62 100644 --- a/crypto/Makefile.am.masm-x86_64 +++ b/crypto/Makefile.am.masm-x86_64 @@ -14,9 +14,6 @@ libcrypto_la_SOURCES += aes/aes_amd64.c libcrypto_la_SOURCES += modes/gcm128_amd64.c libcrypto_la_CPPFLAGS += -DAES_ASM -libcrypto_la_CPPFLAGS += -DBSAES_ASM -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 += -DGHASH_ASM diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index efe2643..cf761dc 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 @@ -15,9 +15,6 @@ libcrypto_la_SOURCES += modes/gcm128_amd64.c libcrypto_la_CPPFLAGS += -Dendbr32=endbr64 libcrypto_la_CPPFLAGS += -DAES_ASM -libcrypto_la_CPPFLAGS += -DBSAES_ASM -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 += -DGHASH_ASM