Merge aes_cbc.c into aes.c now that aes_cbc.c is used on all platforms.

11 files changed, 16 insertions, 21 deletions

diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
index d9ab7789bb..6f57fa230f 100644
--- a/src/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 12:52:58 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c aes_cbc.c
+SRCS+= aes_core.c
 # bn
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
index 2a3bf263b1..ac8314563c 100644
--- a/src/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/src/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 12:52:58 jsing Exp $
 
 # alpha-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c aes_cbc.c 
+SRCS+= aes_core.c
 # bn
 SSLASM+= bn alpha-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 13d2c0b1be..2dcf64d045 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.19 2024/03/28 12:28:48 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.20 2024/03/28 12:52:58 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -14,7 +14,6 @@ CFLAGS+= -DVPAES_ASM
 SSLASM+= aes vpaes-x86_64
 SSLASM+= aes aesni-x86_64
 CFLAGS+= -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-SRCS+= aes_cbc.c
 # bn
 CFLAGS+= -DOPENSSL_IA32_SSE2
 CFLAGS+= -DRSA_ASM
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index 443fe9e647..b0d125572c 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -3,7 +3,6 @@
 # arm-specific libcrypto build rules
 
 # aes
-SRCS+= aes_cbc.c 
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-armv4
 # bn
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index 84128559ce..bbe4c9ac1e 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.19 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.20 2024/03/28 12:52:58 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c aes_cbc.c 
+SRCS+= aes_core.c
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-parisc aes-parisc
 # bn
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index cd356eeea5..5741bc6f3b 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.16 2024/03/28 12:28:48 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2024/03/28 12:52:58 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -12,7 +12,6 @@ CFLAGS+= -DVPAES_ASM
 SSLASM+= aes vpaes-x86
 SSLASM+= aes aesni-x86
 CFLAGS+= -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-SRCS+= aes_cbc.c
 # bn
 CFLAGS+= -DOPENSSL_IA32_SSE2
 SSLASM+= bn bn-586
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
index b3a9406f40..d40bbdf00e 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.11 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2024/03/28 12:52:58 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
 # aes
-SRCS+= aes_cbc.c 
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-mips aes-mips
 # bn
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index 9011d0b5e9..9e3a2f7280 100644
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.8 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 12:52:58 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c aes_cbc.c 
+SRCS+= aes_core.c
 # slower than C code
 #CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index f45bb013e3..ea466bb8a3 100644
--- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 12:52:58 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c aes_cbc.c 
+SRCS+= aes_core.c
 # slower than C code
 #CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
diff --git a/src/lib/libcrypto/arch/riscv64/Makefile.inc b/src/lib/libcrypto/arch/riscv64/Makefile.inc
index 909cc21829..0737d3ce11 100644
--- a/src/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/src/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.6 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2024/03/28 12:52:58 jsing Exp $
 
 # riscv64 libcrypto build rules
 
 # aes
 SRCS+= aes_core.c
-SRCS+= aes_cbc.c
 
 # camellia
 SRCS+= camellia.c
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
index b34a66e226..e540fcbbba 100644
--- a/src/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.13 2024/03/28 01:57:00 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2024/03/28 12:52:58 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
 # aes
-SRCS+= aes_core.c aes_cbc.c 
+SRCS+= aes_core.c
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-sparcv9 aes-sparcv9
 # bn