7 files changed, 7 insertions, 15 deletions

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index de9666afdb..27c61edf58 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.42 2025/08/14 15:12:53 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.43 2026/01/17 13:55:30 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -8,13 +8,11 @@ EXTRA_PL =	${LCRYPTO_SRC}/perlasm/x86_64-xlate.pl
 SRCS += crypto_cpu_caps.c
 
 # aes
-CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-x86_64
 SSLASM+= aes aesni-x86_64
 SRCS += aes_amd64.c
 
 # bn
-CFLAGS+= -DRSA_ASM
 SSLASM+= bn modexp512-x86_64
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn x86_64-mont
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index bb8f1498dd..ebcc4c8208 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.27 2025/09/07 06:28:03 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.28 2026/01/17 13:55:30 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
 # aes
-CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-parisc aes-parisc
 # bn
 SSLASM+= bn parisc-mont parisc-mont
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index bfc701687e..d0c1aeea6a 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.31 2025/06/28 12:39:10 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.32 2026/01/17 13:55:30 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -8,7 +8,6 @@ EXTRA_PL =  ${LCRYPTO_SRC}/perlasm/x86gas.pl ${LCRYPTO_SRC}/perlasm/x86asm.pl
 SRCS += crypto_cpu_caps.c
 
 # aes
-CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-586
 SSLASM+= aes aesni-x86
 SRCS += aes_i386.c
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
index 64e806289d..27de78bb50 100644
--- a/src/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/src/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.19 2025/02/14 12:01:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.20 2026/01/17 13:55:30 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
 # aes
-CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-mips aes-mips
 # bn
 SSLASM+= bn mips bn-mips
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index c5218e53f4..c37d88d779 100644
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.14 2025/02/14 12:01:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2026/01/17 13:55:31 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
 # slower than C code
-#CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
 # bn
 SSLASM+= bn ppc bn-ppc
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index c309ab8b40..a70a5b2057 100644
--- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.16 2025/02/14 12:01:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2026/01/17 13:55:31 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
 # slower than C code
-#CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
 # bn
 #SSLASM+= bn ppc bn-ppc
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
index cbf63e033e..f09a9769a9 100644
--- a/src/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.21 2025/02/14 12:01:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.22 2026/01/17 13:55:31 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
 # aes
-CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-sparcv9 aes-sparcv9
 # bn
 # modes