Move bf_enc.c to the primary Makefile.

Now that all architectures are using bf_enc.c, it does not make sense to
have it in every Makefile.inc file.

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 8c3d05b..4ea8d0c 100644 (file)
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.175 2024/03/19 19:27:33 tb Exp $
+# $OpenBSD: Makefile,v 1.176 2024/03/27 11:12:08 jsing Exp $
 
 LIB=   crypto
 LIBREBUILD=y
@@ -144,6 +144,7 @@ SRCS+= x_x509a.c
 # bf/
 SRCS+= bf_cfb64.c
 SRCS+= bf_ecb.c
+SRCS+= bf_enc.c
 SRCS+= bf_ofb64.c
 SRCS+= bf_skey.c
 

diff --git a/lib/libcrypto/arch/aarch64/Makefile.inc b/lib/libcrypto/arch/aarch64/Makefile.inc
index 82a1e4c..bf33242 100644 (file)
--- a/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.5 2023/04/05 11:07:40 kettenis Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2024/03/27 11:12:08 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
 # aes
 SRCS+= aes_core.c aes_cbc.c
-# bf
-SRCS+= bf_enc.c
 # bn
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c

diff --git a/lib/libcrypto/arch/alpha/Makefile.inc b/lib/libcrypto/arch/alpha/Makefile.inc
index 4cdcf64..20bc246 100644 (file)
--- a/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.6 2023/01/31 06:17:10 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $
 
 # alpha-specific libcrypto build rules
 
 # aes
 SRCS+= aes_core.c aes_cbc.c 
-# bf
-SRCS+= bf_enc.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 a181d05..878965f 100644 (file)
--- a/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.13 2023/04/15 18:23:54 tb Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2024/03/27 11:12:08 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -14,8 +14,6 @@ CFLAGS+= -DVPAES_ASM
 SSLASM+= aes vpaes-x86_64
 SSLASM+= aes aesni-x86_64
 SSLASM+= aes aesni-sha1-x86_64
-# bf
-SRCS+= bf_enc.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 6e776df..ae57ae0 100644 (file)
--- a/lib/libcrypto/arch/arm/Makefile.inc
+++ b/lib/libcrypto/arch/arm/Makefile.inc
@@ -6,8 +6,6 @@
 SRCS+= aes_cbc.c 
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-armv4
-# bf
-SRCS+= bf_enc.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 c11b899..5454a4e 100644 (file)
--- a/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.14 2023/01/31 06:17:10 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2024/03/27 11:12:08 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
@@ -6,8 +6,6 @@
 SRCS+= aes_core.c aes_cbc.c 
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-parisc aes-parisc
-# bf
-SRCS+= bf_enc.c
 # bn
 SSLASM+= bn parisc-mont parisc-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W

diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc
index 6957eff..49eab68 100644 (file)
--- a/lib/libcrypto/arch/i386/Makefile.inc
+++ b/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2024/03/27 10:59:48 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2024/03/27 11:12:08 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -11,8 +11,6 @@ SSLASM+= aes aes-586
 CFLAGS+= -DVPAES_ASM
 SSLASM+= aes vpaes-x86
 SSLASM+= aes aesni-x86
-# bf
-SRCS+= bf_enc.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 2d547f4..403c9d3 100644 (file)
--- a/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2023/01/20 10:07:52 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 11:12:08 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
@@ -6,8 +6,6 @@
 SRCS+= aes_cbc.c 
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-mips aes-mips
-# bf
-SRCS+= bf_enc.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 6c168c7..86ea364 100644 (file)
--- a/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2023/01/17 15:04:27 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2024/03/27 11:12:08 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -7,8 +7,6 @@ SRCS+= aes_core.c aes_cbc.c
 # slower than C code
 #CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
-# bf
-SRCS+= bf_enc.c
 # bn
 SSLASM+= bn ppc bn-ppc
 SSLASM+= bn ppc-mont ppc-mont          # bn_mul_mont_int

diff --git a/lib/libcrypto/arch/powerpc64/Makefile.inc b/lib/libcrypto/arch/powerpc64/Makefile.inc
index fe19069..8816f0d 100644 (file)
--- a/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2023/01/31 06:17:10 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -7,8 +7,6 @@ SRCS+= aes_core.c aes_cbc.c
 # slower than C code
 #CFLAGS+= -DAES_ASM
 #SSLASM+= aes aes-ppc aes-ppc
-# bf
-SRCS+= bf_enc.c
 # bn
 #SSLASM+= bn ppc bn-ppc
 #SSLASM+= bn ppc-mont ppc-mont         # bn_mul_mont_int

diff --git a/lib/libcrypto/arch/riscv64/Makefile.inc b/lib/libcrypto/arch/riscv64/Makefile.inc
index 7094746..e0d7e18 100644 (file)
--- a/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2023/08/25 02:17:41 tb Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2024/03/27 11:12:08 jsing Exp $
 
 # riscv64 libcrypto build rules
 
@@ -6,9 +6,6 @@
 SRCS+= aes_core.c
 SRCS+= aes_cbc.c
 
-# bf
-SRCS+= bf_enc.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 1b149ff..dcc9033 100644 (file)
--- a/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2023/01/31 06:17:10 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2024/03/27 11:12:09 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
@@ -6,8 +6,6 @@
 SRCS+= aes_core.c aes_cbc.c 
 CFLAGS+= -DAES_ASM
 SSLASM+= aes aes-sparcv9 aes-sparcv9
-# bf
-SRCS+= bf_enc.c
 # bn
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c