Move des sources to primary Makefile.

Now that all platforms use a C des implementation, move it to the primary
Makefile.

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 63600aa..447a8f6 100644 (file)
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.180 2024/03/28 00:57:26 jsing Exp $
+# $OpenBSD: Makefile,v 1.181 2024/03/28 01:41:16 jsing Exp $
 
 LIB=   crypto
 LIBREBUILD=y
@@ -266,12 +266,14 @@ SRCS+= cbc_enc.c
 SRCS+= cfb64ede.c
 SRCS+= cfb64enc.c
 SRCS+= cfb_enc.c
+SRCS+= des_enc.c
 SRCS+= ecb3_enc.c
 SRCS+= ecb_enc.c
 SRCS+= ede_cbcm_enc.c
 SRCS+= enc_read.c
 SRCS+= enc_writ.c
 SRCS+= fcrypt.c
+SRCS+= fcrypt_b.c
 SRCS+= ofb64ede.c
 SRCS+= ofb64enc.c
 SRCS+= ofb_enc.c

diff --git a/lib/libcrypto/arch/aarch64/Makefile.inc b/lib/libcrypto/arch/aarch64/Makefile.inc
index c9bc4c1..feb11a1 100644 (file)
--- a/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 12:54:42 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2024/03/28 01:41:16 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
@@ -7,8 +7,6 @@ SRCS+= aes_core.c aes_cbc.c
 # bn
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # modes
 # rc4
 SRCS+= rc4.c

diff --git a/lib/libcrypto/arch/alpha/Makefile.inc b/lib/libcrypto/arch/alpha/Makefile.inc
index 52618fd..5ebc983 100644 (file)
--- a/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:41:16 jsing Exp $
 
 # alpha-specific libcrypto build rules
 
@@ -9,8 +9,6 @@ SSLASM+= bn alpha-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # modes
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-alpha

diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc
index ab10e43..b04923b 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.15 2024/03/27 12:42:30 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2024/03/28 01:41:16 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -39,8 +39,6 @@ SRCS += word_clz.S
 # camellia
 SRCS+= cmll_misc.c
 SSLASM+= camellia cmll-x86_64
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # md5
 CFLAGS+= -DMD5_ASM
 SSLASM+= md5 md5-x86_64

diff --git a/lib/libcrypto/arch/arm/Makefile.inc b/lib/libcrypto/arch/arm/Makefile.inc
index a0b1a90..e30a1a8 100644 (file)
--- a/lib/libcrypto/arch/arm/Makefile.inc
+++ b/lib/libcrypto/arch/arm/Makefile.inc
@@ -11,8 +11,6 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn armv4-mont
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # modes
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-armv4

diff --git a/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc
index 92f18cc..3668d2f 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.17 2024/03/27 12:59:12 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.18 2024/03/28 01:41:16 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
@@ -11,8 +11,6 @@ SSLASM+= bn parisc-mont parisc-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # modes
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-parisc ghash-parisc

diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc
index dcf50d9..c1a52e7 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.12 2024/03/28 01:14:31 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2024/03/28 01:41:16 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -19,8 +19,6 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn x86-mont
 # camellia
 SSLASM+= camellia cmll-x86
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # md5
 CFLAGS+= -DMD5_ASM
 SSLASM+= md5 md5-586

diff --git a/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc
index e13906e..30a4047 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.9 2024/03/27 12:54:42 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:41:16 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
@@ -12,8 +12,6 @@ SSLASM+= bn mips-mont mips-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # rc4
 SRCS+= rc4.c
 # sha

diff --git a/lib/libcrypto/arch/powerpc/Makefile.inc b/lib/libcrypto/arch/powerpc/Makefile.inc
index 76d42f9..c89af9b 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.6 2024/03/27 12:54:42 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2024/03/28 01:41:16 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -14,8 +14,6 @@ SSLASM+= bn ppc-mont ppc-mont         # bn_mul_mont_int
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # rc4
 SRCS+= rc4.c
 # sha

diff --git a/lib/libcrypto/arch/powerpc64/Makefile.inc b/lib/libcrypto/arch/powerpc64/Makefile.inc
index 5abddf2..0ce671a 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.8 2024/03/27 12:54:42 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:41:16 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -14,8 +14,6 @@ SRCS+= aes_core.c aes_cbc.c
 #CFLAGS+= -DOPENSSL_BN_ASM_MONT
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # rc4
 SRCS+= rc4.c
 # sha

diff --git a/lib/libcrypto/arch/riscv64/Makefile.inc b/lib/libcrypto/arch/riscv64/Makefile.inc
index 7d426ae..7807da6 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.4 2024/03/27 12:54:42 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2024/03/28 01:41:16 jsing Exp $
 
 # riscv64 libcrypto build rules
 
@@ -11,10 +11,6 @@ SRCS+= camellia.c
 SRCS+= cmll_cbc.c
 SRCS+= cmll_misc.c
 
-# des
-SRCS+= des_enc.c
-SRCS+= fcrypt_b.c
-
 # rc4
 SRCS+= rc4.c
 

diff --git a/lib/libcrypto/arch/sparc64/Makefile.inc b/lib/libcrypto/arch/sparc64/Makefile.inc
index d5bf70a..1c596eb 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.11 2024/03/28 01:34:04 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2024/03/28 01:41:16 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
@@ -9,8 +9,6 @@ SSLASM+= aes aes-sparcv9 aes-sparcv9
 # bn
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-# des
-SRCS+= des_enc.c fcrypt_b.c
 # modes
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-sparcv9 ghash-sparcv9