From: jsing <jsing@openbsd.org>
Date: Fri, 29 Mar 2024 06:03:20 +0000 (+0000)
Subject: Move aes_core.c to the primary Makefile.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=94b168e340322bf8fa14e1e7e2c4aed295d41cf3;p=openbsd

Move aes_core.c to the primary Makefile.

This is now built on all platforms.
---

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 49322bc5bb6..5220a5bdd03 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.188 2024/03/29 05:23:50 jsing Exp $
+# $OpenBSD: Makefile,v 1.189 2024/03/29 06:03:20 jsing Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -73,6 +73,7 @@ SRCS+= o_str.c
 
 # aes/
 SRCS+= aes.c
+SRCS+= aes_core.c
 SRCS+= aes_ige.c
 
 # asn1/
@@ -784,7 +785,6 @@ obj_dat.h: obj_mac.h ${SSL_OBJECTS}/obj_dat.pl
 .include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc"
 .else
 CFLAGS+=-DOPENSSL_NO_ASM
-SRCS+= aes_core.c
 SRCS+= camellia.c
 SRCS+= cmll_cbc.c
 SRCS+= cmll_misc.c
diff --git a/lib/libcrypto/arch/aarch64/Makefile.inc b/lib/libcrypto/arch/aarch64/Makefile.inc
index 0c16c8d79a5..75df7f1ea0f 100644
--- a/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,14 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.11 2024/03/29 02:33:44 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 06:03:20 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
-# aes
-SRCS+= aes_core.c
-# bn
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# modes
-# sha
 
 .for dir f in ${SSLASM}
 SRCS+=	${f}.S
diff --git a/lib/libcrypto/arch/alpha/Makefile.inc b/lib/libcrypto/arch/alpha/Makefile.inc
index 9c5923589b3..ec3f6c5f2b7 100644
--- a/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 02:33:44 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 06:03:20 jsing Exp $
 
 # alpha-specific libcrypto build rules
 
-# aes
-SRCS+= aes_core.c
 # bn
 SSLASM+= bn alpha-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc
index 06417c06f33..1562e7ec76d 100644
--- a/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2024/03/29 04:39:54 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2024/03/29 06:03:20 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -16,7 +16,6 @@ SSLASM+= aes aesni-x86_64
 CFLAGS+= -DHAVE_AES_CBC_ENCRYPT_INTERNAL
 CFLAGS+= -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
 CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-SRCS+= aes_core.c
 # bn
 CFLAGS+= -DOPENSSL_IA32_SSE2
 CFLAGS+= -DRSA_ASM
diff --git a/lib/libcrypto/arch/arm/Makefile.inc b/lib/libcrypto/arch/arm/Makefile.inc
index bfef312f719..bd443dd4d3f 100644
--- a/lib/libcrypto/arch/arm/Makefile.inc
+++ b/lib/libcrypto/arch/arm/Makefile.inc
@@ -7,7 +7,6 @@ CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-armv4
 CFLAGS+= -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
 CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-SRCS+= aes_core.c
 # bn
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn armv4-mont
diff --git a/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc
index 948aff2107f..62887c7c860 100644
--- a/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.21 2024/03/29 02:33:44 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.22 2024/03/29 06:03:20 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-parisc aes-parisc
 # bn
diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc
index 0722c4e5a0d..934da3ef7e0 100644
--- a/lib/libcrypto/arch/i386/Makefile.inc
+++ b/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.20 2024/03/29 04:39:54 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2024/03/29 06:03:21 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -14,7 +14,6 @@ SSLASM+= aes aesni-x86
 CFLAGS+= -DHAVE_AES_CBC_ENCRYPT_INTERNAL
 CFLAGS+= -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
 CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-SRCS+= aes_core.c
 # bn
 CFLAGS+= -DOPENSSL_IA32_SSE2
 SSLASM+= bn bn-586
diff --git a/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc
index c8bcca68781..bfead1757e1 100644
--- a/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.14 2024/03/29 04:39:54 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2024/03/29 06:03:21 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
@@ -7,7 +7,6 @@ CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-mips aes-mips
 CFLAGS+= -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
 CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-SRCS+= aes_core.c
 # bn
 SSLASM+= bn mips bn-mips
 SSLASM+= bn mips-mont mips-mont
diff --git a/lib/libcrypto/arch/powerpc/Makefile.inc b/lib/libcrypto/arch/powerpc/Makefile.inc
index a20d083434b..965a22c50cb 100644
--- a/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.10 2024/03/29 02:33:44 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2024/03/29 06:03:21 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
-# aes
-SRCS+= aes_core.c
 # slower than C code
 #CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
diff --git a/lib/libcrypto/arch/powerpc64/Makefile.inc b/lib/libcrypto/arch/powerpc64/Makefile.inc
index 1e71fd4ba01..d1eea07681a 100644
--- a/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 02:33:45 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 06:03:21 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
-# aes
-SRCS+= aes_core.c
 # slower than C code
 #CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
diff --git a/lib/libcrypto/arch/riscv64/Makefile.inc b/lib/libcrypto/arch/riscv64/Makefile.inc
index ddb2e631e85..aecc312e2dc 100644
--- a/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,10 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.8 2024/03/29 02:33:45 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2024/03/29 06:03:21 jsing Exp $
 
 # riscv64 libcrypto build rules
 
-# aes
-SRCS+= aes_core.c
-
 # camellia
 SRCS+= camellia.c
 SRCS+= cmll_cbc.c
diff --git a/lib/libcrypto/arch/sparc64/Makefile.inc b/lib/libcrypto/arch/sparc64/Makefile.inc
index ef1fdcfcd07..bf481374138 100644
--- a/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.15 2024/03/29 02:33:45 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2024/03/29 06:03:21 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-sparcv9 aes-sparcv9
 # bn