summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2024-03-28 01:41:16 +0000
committerjsing <>2024-03-28 01:41:16 +0000
commit3464202a67bd692f85f993dcb7a602dcc8a8bd9c (patch)
treee8e7947306aba3f2f14276f0544a16e319ad57bf /src
parent0ca118f41ed52cd6b06d9c71fcc751a9a701f1f9 (diff)
downloadopenbsd-3464202a67bd692f85f993dcb7a602dcc8a8bd9c.tar.gz
openbsd-3464202a67bd692f85f993dcb7a602dcc8a8bd9c.tar.bz2
openbsd-3464202a67bd692f85f993dcb7a602dcc8a8bd9c.zip
Move des sources to primary Makefile.
Now that all platforms use a C des implementation, move it to the primary Makefile.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Makefile4
-rw-r--r--src/lib/libcrypto/arch/aarch64/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/alpha/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/amd64/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/arm/Makefile.inc2
-rw-r--r--src/lib/libcrypto/arch/hppa/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/i386/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/mips64/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/powerpc/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/powerpc64/Makefile.inc4
-rw-r--r--src/lib/libcrypto/arch/riscv64/Makefile.inc6
-rw-r--r--src/lib/libcrypto/arch/sparc64/Makefile.inc4
12 files changed, 13 insertions, 35 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 63600aa923..447a8f65b5 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.180 2024/03/28 00:57:26 jsing Exp $ 1# $OpenBSD: Makefile,v 1.181 2024/03/28 01:41:16 jsing Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -266,12 +266,14 @@ SRCS+= cbc_enc.c
266SRCS+= cfb64ede.c 266SRCS+= cfb64ede.c
267SRCS+= cfb64enc.c 267SRCS+= cfb64enc.c
268SRCS+= cfb_enc.c 268SRCS+= cfb_enc.c
269SRCS+= des_enc.c
269SRCS+= ecb3_enc.c 270SRCS+= ecb3_enc.c
270SRCS+= ecb_enc.c 271SRCS+= ecb_enc.c
271SRCS+= ede_cbcm_enc.c 272SRCS+= ede_cbcm_enc.c
272SRCS+= enc_read.c 273SRCS+= enc_read.c
273SRCS+= enc_writ.c 274SRCS+= enc_writ.c
274SRCS+= fcrypt.c 275SRCS+= fcrypt.c
276SRCS+= fcrypt_b.c
275SRCS+= ofb64ede.c 277SRCS+= ofb64ede.c
276SRCS+= ofb64enc.c 278SRCS+= ofb64enc.c
277SRCS+= ofb_enc.c 279SRCS+= ofb_enc.c
diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
index c9bc4c1701..feb11a1256 100644
--- a/src/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 12:54:42 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.8 2024/03/28 01:41:16 jsing Exp $
2 2
3# aarch64-specific libcrypto build rules 3# aarch64-specific libcrypto build rules
4 4
@@ -7,8 +7,6 @@ SRCS+= aes_core.c aes_cbc.c
7# bn 7# bn
8# camellia 8# camellia
9SRCS+= camellia.c cmll_cbc.c cmll_misc.c 9SRCS+= camellia.c cmll_cbc.c cmll_misc.c
10# des
11SRCS+= des_enc.c fcrypt_b.c
12# modes 10# modes
13# rc4 11# rc4
14SRCS+= rc4.c 12SRCS+= rc4.c
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
index 52618fdb1d..5ebc9833b9 100644
--- a/src/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/src/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:41:16 jsing Exp $
2 2
3# alpha-specific libcrypto build rules 3# alpha-specific libcrypto build rules
4 4
@@ -9,8 +9,6 @@ SSLASM+= bn alpha-mont
9CFLAGS+= -DOPENSSL_BN_ASM_MONT 9CFLAGS+= -DOPENSSL_BN_ASM_MONT
10# camellia 10# camellia
11SRCS+= camellia.c cmll_cbc.c cmll_misc.c 11SRCS+= camellia.c cmll_cbc.c cmll_misc.c
12# des
13SRCS+= des_enc.c fcrypt_b.c
14# modes 12# modes
15CFLAGS+= -DGHASH_ASM 13CFLAGS+= -DGHASH_ASM
16SSLASM+= modes ghash-alpha 14SSLASM+= modes ghash-alpha
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index ab10e43a14..b04923b596 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.15 2024/03/27 12:42:30 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.16 2024/03/28 01:41:16 jsing Exp $
2 2
3# amd64-specific libcrypto build rules 3# amd64-specific libcrypto build rules
4 4
@@ -39,8 +39,6 @@ SRCS += word_clz.S
39# camellia 39# camellia
40SRCS+= cmll_misc.c 40SRCS+= cmll_misc.c
41SSLASM+= camellia cmll-x86_64 41SSLASM+= camellia cmll-x86_64
42# des
43SRCS+= des_enc.c fcrypt_b.c
44# md5 42# md5
45CFLAGS+= -DMD5_ASM 43CFLAGS+= -DMD5_ASM
46SSLASM+= md5 md5-x86_64 44SSLASM+= md5 md5-x86_64
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index a0b1a90df9..e30a1a8790 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -11,8 +11,6 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
11SSLASM+= bn armv4-mont 11SSLASM+= bn armv4-mont
12# camellia 12# camellia
13SRCS+= camellia.c cmll_cbc.c cmll_misc.c 13SRCS+= camellia.c cmll_cbc.c cmll_misc.c
14# des
15SRCS+= des_enc.c fcrypt_b.c
16# modes 14# modes
17CFLAGS+= -DGHASH_ASM 15CFLAGS+= -DGHASH_ASM
18SSLASM+= modes ghash-armv4 16SSLASM+= modes ghash-armv4
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index 92f18cc6b8..3668d2ffe7 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.17 2024/03/27 12:59:12 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.18 2024/03/28 01:41:16 jsing Exp $
2 2
3# hppa-specific libcrypto build rules 3# hppa-specific libcrypto build rules
4 4
@@ -11,8 +11,6 @@ SSLASM+= bn parisc-mont parisc-mont
11CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W 11CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
12# camellia 12# camellia
13SRCS+= camellia.c cmll_cbc.c cmll_misc.c 13SRCS+= camellia.c cmll_cbc.c cmll_misc.c
14# des
15SRCS+= des_enc.c fcrypt_b.c
16# modes 14# modes
17CFLAGS+= -DGHASH_ASM 15CFLAGS+= -DGHASH_ASM
18SSLASM+= modes ghash-parisc ghash-parisc 16SSLASM+= modes ghash-parisc ghash-parisc
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index dcf50d95ca..c1a52e786a 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.12 2024/03/28 01:14:31 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.13 2024/03/28 01:41:16 jsing Exp $
2 2
3# i386-specific libcrypto build rules 3# i386-specific libcrypto build rules
4 4
@@ -19,8 +19,6 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
19SSLASM+= bn x86-mont 19SSLASM+= bn x86-mont
20# camellia 20# camellia
21SSLASM+= camellia cmll-x86 21SSLASM+= camellia cmll-x86
22# des
23SRCS+= des_enc.c fcrypt_b.c
24# md5 22# md5
25CFLAGS+= -DMD5_ASM 23CFLAGS+= -DMD5_ASM
26SSLASM+= md5 md5-586 24SSLASM+= md5 md5-586
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
index e13906e954..30a4047e34 100644
--- a/src/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/src/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.9 2024/03/27 12:54:42 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:41:16 jsing Exp $
2 2
3# mips64-specific libcrypto build rules 3# mips64-specific libcrypto build rules
4 4
@@ -12,8 +12,6 @@ SSLASM+= bn mips-mont mips-mont
12CFLAGS+= -DOPENSSL_BN_ASM_MONT 12CFLAGS+= -DOPENSSL_BN_ASM_MONT
13# camellia 13# camellia
14SRCS+= camellia.c cmll_cbc.c cmll_misc.c 14SRCS+= camellia.c cmll_cbc.c cmll_misc.c
15# des
16SRCS+= des_enc.c fcrypt_b.c
17# rc4 15# rc4
18SRCS+= rc4.c 16SRCS+= rc4.c
19# sha 17# sha
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index 76d42f9e87..c89af9b0c0 100644
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.6 2024/03/27 12:54:42 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.7 2024/03/28 01:41:16 jsing Exp $
2 2
3# powerpc-specific libcrypto build rules 3# powerpc-specific libcrypto build rules
4 4
@@ -14,8 +14,6 @@ SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int
14CFLAGS+= -DOPENSSL_BN_ASM_MONT 14CFLAGS+= -DOPENSSL_BN_ASM_MONT
15# camellia 15# camellia
16SRCS+= camellia.c cmll_cbc.c cmll_misc.c 16SRCS+= camellia.c cmll_cbc.c cmll_misc.c
17# des
18SRCS+= des_enc.c fcrypt_b.c
19# rc4 17# rc4
20SRCS+= rc4.c 18SRCS+= rc4.c
21# sha 19# sha
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index 5abddf2c9b..0ce671ab31 100644
--- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:41:16 jsing Exp $
2 2
3# powerpc-specific libcrypto build rules 3# powerpc-specific libcrypto build rules
4 4
@@ -14,8 +14,6 @@ SRCS+= aes_core.c aes_cbc.c
14#CFLAGS+= -DOPENSSL_BN_ASM_MONT 14#CFLAGS+= -DOPENSSL_BN_ASM_MONT
15# camellia 15# camellia
16SRCS+= camellia.c cmll_cbc.c cmll_misc.c 16SRCS+= camellia.c cmll_cbc.c cmll_misc.c
17# des
18SRCS+= des_enc.c fcrypt_b.c
19# rc4 17# rc4
20SRCS+= rc4.c 18SRCS+= rc4.c
21# sha 19# sha
diff --git a/src/lib/libcrypto/arch/riscv64/Makefile.inc b/src/lib/libcrypto/arch/riscv64/Makefile.inc
index 7d426ae9bb..7807da6e43 100644
--- a/src/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/src/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.4 2024/03/27 12:54:42 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.5 2024/03/28 01:41:16 jsing Exp $
2 2
3# riscv64 libcrypto build rules 3# riscv64 libcrypto build rules
4 4
@@ -11,10 +11,6 @@ SRCS+= camellia.c
11SRCS+= cmll_cbc.c 11SRCS+= cmll_cbc.c
12SRCS+= cmll_misc.c 12SRCS+= cmll_misc.c
13 13
14# des
15SRCS+= des_enc.c
16SRCS+= fcrypt_b.c
17
18# rc4 14# rc4
19SRCS+= rc4.c 15SRCS+= rc4.c
20 16
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
index d5bf70ac08..1c596ebea3 100644
--- a/src/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 01:34:04 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.12 2024/03/28 01:41:16 jsing Exp $
2 2
3# sparc64-specific libcrypto build rules 3# sparc64-specific libcrypto build rules
4 4
@@ -9,8 +9,6 @@ SSLASM+= aes aes-sparcv9 aes-sparcv9
9# bn 9# bn
10# camellia 10# camellia
11SRCS+= camellia.c cmll_cbc.c cmll_misc.c 11SRCS+= camellia.c cmll_cbc.c cmll_misc.c
12# des
13SRCS+= des_enc.c fcrypt_b.c
14# modes 12# modes
15CFLAGS+= -DGHASH_ASM 13CFLAGS+= -DGHASH_ASM
16SSLASM+= modes ghash-sparcv9 ghash-sparcv9 14SSLASM+= modes ghash-sparcv9 ghash-sparcv9
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 21:25:35 +0000