Revise portable to work with LIBRESSL_USE_*_ASSEMBLY defines

9 files changed, 51 insertions, 60 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index cb28fc3..1cacbf4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -52,11 +52,12 @@ if(HOST_ASM_ELF_X86_64)
                 bn/arch/amd64/bignum_sub.S
                 bn/arch/amd64/word_clz.S
         )
-        add_definitions(-DAES_ASM)
+        add_definitions(-DLIBRESSL_USE_AES_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_BN_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_GCM_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_RC4_ASSEMBLY)
         add_definitions(-DOPENSSL_BN_ASM_MONT)
         add_definitions(-DOPENSSL_BN_ASM_MONT5)
-        add_definitions(-DGHASH_ASM)
-        add_definitions(-DRSA_ASM)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
 endif()
 
@@ -97,11 +98,12 @@ if(HOST_ASM_MACOSX_X86_64)
                 bn/arch/amd64/bignum_sub.S
                 bn/arch/amd64/word_clz.S
         )
-        add_definitions(-DAES_ASM)
+        add_definitions(-DLIBRESSL_USE_AES_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_BN_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_GCM_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_RC4_ASSEMBLY)
         add_definitions(-DOPENSSL_BN_ASM_MONT)
         add_definitions(-DOPENSSL_BN_ASM_MONT5)
-        add_definitions(-DGHASH_ASM)
-        add_definitions(-DRSA_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()
@@ -121,11 +123,12 @@ if(HOST_ASM_MASM_X86_64)
                 rc4/rc4-masm-x86_64.S
         )
         add_definitions(-Dendbr64=)
-        add_definitions(-DAES_ASM)
+        add_definitions(-DLIBRESSL_USE_AES_ASSEMBLY)
+        #add_definitions(-DLIBRESSL_USE_BN_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_GCM_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_RC4_ASSEMBLY)
         #add_definitions(-DOPENSSL_BN_ASM_MONT)
         #add_definitions(-DOPENSSL_BN_ASM_MONT5)
-        add_definitions(-DGHASH_ASM)
-        add_definitions(-DRSA_ASM)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
         set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
 endif()
@@ -145,11 +148,12 @@ if(HOST_ASM_MINGW64_X86_64)
                 rc4/rc4-mingw64-x86_64.S
         )
         add_definitions(-Dendbr32=endbr64)
-        add_definitions(-DAES_ASM)
+        add_definitions(-DLIBRESSL_USE_AES_ASSEMBLY)
+        #add_definitions(-DLIBRESSL_USE_BN_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_GCM_ASSEMBLY)
+        add_definitions(-DLIBRESSL_USE_RC4_ASSEMBLY)
         #add_definitions(-DOPENSSL_BN_ASM_MONT)
         #add_definitions(-DOPENSSL_BN_ASM_MONT5)
-        add_definitions(-DGHASH_ASM)
-        add_definitions(-DRSA_ASM)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
 endif()
 
diff --git a/crypto/Makefile.am.elf-mips b/crypto/Makefile.am.elf-mips
index f7a44f2..2276991 100644
--- a/crypto/Makefile.am.elf-mips
+++ b/crypto/Makefile.am.elf-mips
@@ -8,7 +8,11 @@ ASM_MIPS_ELF += sha/sha256-mips.S
 EXTRA_DIST += $(ASM_MIPS_ELF)
 
 if HOST_ASM_ELF_MIPS
-libcrypto_la_CPPFLAGS += -DAES_ASM
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_AES_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_BN_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_SHA_ASSEMBLY
+
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+
 libcrypto_la_SOURCES += $(ASM_MIPS_ELF)
 endif
diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64
index 7d90bc0..c6727b3 100644
--- a/crypto/Makefile.am.elf-mips64
+++ b/crypto/Makefile.am.elf-mips64
@@ -8,7 +8,11 @@ ASM_MIPS64_ELF += sha/sha256-mips.S
 EXTRA_DIST += $(ASM_MIPS64_ELF)
 
 if HOST_ASM_ELF_MIPS64
-libcrypto_la_CPPFLAGS += -DAES_ASM
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_AES_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_BN_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_SHA_ASSEMBLY
+
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+
 libcrypto_la_SOURCES += $(ASM_MIPS64_ELF)
 endif
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index c85deb1..d1b067d 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -36,10 +36,13 @@ libcrypto_la_SOURCES += aes/aes_amd64.c
 libcrypto_la_SOURCES += bn/arch/amd64/bn_arch.c
 libcrypto_la_SOURCES += modes/gcm128_amd64.c
 
-libcrypto_la_CPPFLAGS += -DAES_ASM
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_AES_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_BN_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_GCM_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_RC4_ASSEMBLY
+
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
-libcrypto_la_CPPFLAGS += -DGHASH_ASM
-libcrypto_la_CPPFLAGS += -DRSA_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 7fa38ab..7a26649 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -36,10 +36,13 @@ libcrypto_la_SOURCES += aes/aes_amd64.c
 libcrypto_la_SOURCES += bn/arch/amd64/bn_arch.c
 libcrypto_la_SOURCES += modes/gcm128_amd64.c
 
-libcrypto_la_CPPFLAGS += -DAES_ASM
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_AES_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_BN_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_GCM_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_RC4_ASSEMBLY
+
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
-libcrypto_la_CPPFLAGS += -DGHASH_ASM
-libcrypto_la_CPPFLAGS += -DRSA_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 b24df62..249f86b 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -13,10 +13,13 @@ if HOST_ASM_MASM_X86_64
 libcrypto_la_SOURCES += aes/aes_amd64.c
 libcrypto_la_SOURCES += modes/gcm128_amd64.c
 
-libcrypto_la_CPPFLAGS += -DAES_ASM
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_AES_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_BN_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_GCM_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_RC4_ASSEMBLY
+
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
-libcrypto_la_CPPFLAGS += -DGHASH_ASM
-libcrypto_la_CPPFLAGS += -DRSA_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 cf761dc..e725a05 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -14,10 +14,14 @@ libcrypto_la_SOURCES += aes/aes_amd64.c
 libcrypto_la_SOURCES += modes/gcm128_amd64.c
 
 libcrypto_la_CPPFLAGS += -Dendbr32=endbr64
-libcrypto_la_CPPFLAGS += -DAES_ASM
+
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_AES_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_BN_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_GCM_ASSEMBLY
+libcrypto_la_CPPFLAGS += -DLIBRESSL_USE_RC4_ASSEMBLY
+
 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
-libcrypto_la_CPPFLAGS += -DGHASH_ASM
-libcrypto_la_CPPFLAGS += -DRSA_ASM
+
 libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64)
 endif
diff --git a/patches/aarch64_crypto_arch.h.patch b/patches/aarch64_crypto_arch.h.patch
deleted file mode 100644
index e6a8cbf..0000000
--- a/patches/aarch64_crypto_arch.h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- crypto/arch/aarch64/crypto_arch.h.orig      Sun Jun 29 03:49:56 2025
-+++ crypto/arch/aarch64/crypto_arch.h   Sun Jun 29 04:00:13 2025
-@@ -34,11 +34,13 @@ extern uint64_t crypto_cpu_caps_aarch64;
- #define CRYPTO_CPU_CAPS_AARCH64_SHA3   (1ULL << 5)
- 
- #ifndef OPENSSL_NO_ASM
-+#if 0
- 
- #define HAVE_SHA1_BLOCK_DATA_ORDER
- #define HAVE_SHA256_BLOCK_DATA_ORDER
- #define HAVE_SHA512_BLOCK_DATA_ORDER
- 
-+#endif
- #endif
- 
- #endif
diff --git a/patches/amd64_crypto_arch.h.patch b/patches/amd64_crypto_arch.h.patch
deleted file mode 100644
index e31f988..0000000
--- a/patches/amd64_crypto_arch.h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- crypto/arch/amd64/crypto_arch.h.orig        Fri Oct 24 07:06:10 2025
-+++ crypto/arch/amd64/crypto_arch.h     Fri Oct 24 07:06:21 2025
-@@ -53,6 +53,7 @@ extern uint64_t crypto_cpu_caps_amd64;
- #define HAVE_RC4_INTERNAL
- #define HAVE_RC4_SET_KEY_INTERNAL
- 
-+#if 0
- #define HAVE_SHA1_BLOCK_DATA_ORDER
- #define HAVE_SHA1_BLOCK_GENERIC
- 
-@@ -61,6 +62,7 @@ extern uint64_t crypto_cpu_caps_amd64;
- 
- #define HAVE_SHA512_BLOCK_DATA_ORDER
- #define HAVE_SHA512_BLOCK_GENERIC
-+#endif
- 
- #endif
-