summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2024-03-28 01:57:00 +0000
committerjsing <>2024-03-28 01:57:00 +0000
commit91a8e6eb18ca31999b645c425d34ee1fb2113bcc (patch)
tree9993b4ef1565c1f80acfaaacd4ed80f63a372ed3 /src
parentefdc2fdd7e31b41f518a70445b050722a765ff02 (diff)
downloadopenbsd-91a8e6eb18ca31999b645c425d34ee1fb2113bcc.tar.gz
openbsd-91a8e6eb18ca31999b645c425d34ee1fb2113bcc.tar.bz2
openbsd-91a8e6eb18ca31999b645c425d34ee1fb2113bcc.zip
Move rc4.c to primary Makefile.
This is now built on all platforms.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Makefile5
-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.inc3
-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.inc3
-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.inc5
-rw-r--r--src/lib/libcrypto/arch/sparc64/Makefile.inc4
12 files changed, 14 insertions, 32 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 447a8f65b5..a794e8b10f 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.181 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile,v 1.182 2024/03/28 01:57:00 jsing Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -492,6 +492,9 @@ SRCS+= rc2_skey.c
492SRCS+= rc2cfb64.c 492SRCS+= rc2cfb64.c
493SRCS+= rc2ofb64.c 493SRCS+= rc2ofb64.c
494 494
495# rc4/
496SRCS+= rc4.c
497
495# ripemd/ 498# ripemd/
496SRCS+= ripemd.c 499SRCS+= ripemd.c
497 500
diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
index feb11a1256..d9ab7789bb 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.8 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:57:00 jsing Exp $
2 2
3# aarch64-specific libcrypto build rules 3# aarch64-specific libcrypto build rules
4 4
@@ -8,8 +8,6 @@ SRCS+= aes_core.c aes_cbc.c
8# camellia 8# camellia
9SRCS+= camellia.c cmll_cbc.c cmll_misc.c 9SRCS+= camellia.c cmll_cbc.c cmll_misc.c
10# modes 10# modes
11# rc4
12SRCS+= rc4.c
13# sha 11# sha
14# whrlpool 12# whrlpool
15SRCS+= wp_block.c 13SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
index 5ebc9833b9..2a3bf263b1 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.9 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:57:00 jsing Exp $
2 2
3# alpha-specific libcrypto build rules 3# alpha-specific libcrypto build rules
4 4
@@ -12,8 +12,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
12# modes 12# modes
13CFLAGS+= -DGHASH_ASM 13CFLAGS+= -DGHASH_ASM
14SSLASM+= modes ghash-alpha 14SSLASM+= modes ghash-alpha
15# rc4
16SRCS+= rc4.c
17# sha 15# sha
18CFLAGS+= -DSHA1_ASM 16CFLAGS+= -DSHA1_ASM
19SSLASM+= sha sha1-alpha 17SSLASM+= sha sha1-alpha
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 617b9feb9a..40ba3c063c 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.17 2024/03/28 01:49:29 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.18 2024/03/28 01:57:00 jsing Exp $
2 2
3# amd64-specific libcrypto build rules 3# amd64-specific libcrypto build rules
4 4
@@ -49,7 +49,6 @@ SSLASM+= modes ghash-x86_64
49CFLAGS+= -DHAVE_RC4_INTERNAL 49CFLAGS+= -DHAVE_RC4_INTERNAL
50CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL 50CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL
51SSLASM+= rc4 rc4-x86_64 51SSLASM+= rc4 rc4-x86_64
52SRCS+= rc4.c
53# ripemd 52# ripemd
54# sha 53# sha
55CFLAGS+= -DSHA1_ASM 54CFLAGS+= -DSHA1_ASM
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index e30a1a8790..443fe9e647 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -14,8 +14,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
14# modes 14# modes
15CFLAGS+= -DGHASH_ASM 15CFLAGS+= -DGHASH_ASM
16SSLASM+= modes ghash-armv4 16SSLASM+= modes ghash-armv4
17# rc4
18SRCS+= rc4.c
19# sha 17# sha
20CFLAGS+= -DSHA1_ASM 18CFLAGS+= -DSHA1_ASM
21SSLASM+= sha sha1-armv4-large 19SSLASM+= sha sha1-armv4-large
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index 3668d2ffe7..84128559ce 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.18 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.19 2024/03/28 01:57:00 jsing Exp $
2 2
3# hppa-specific libcrypto build rules 3# hppa-specific libcrypto build rules
4 4
@@ -14,8 +14,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
14# modes 14# modes
15CFLAGS+= -DGHASH_ASM 15CFLAGS+= -DGHASH_ASM
16SSLASM+= modes ghash-parisc ghash-parisc 16SSLASM+= modes ghash-parisc ghash-parisc
17# rc4
18SRCS+= rc4.c
19# sha 17# sha
20CFLAGS+= -DSHA1_ASM 18CFLAGS+= -DSHA1_ASM
21SSLASM+= sha sha1-parisc sha1-parisc 19SSLASM+= sha sha1-parisc sha1-parisc
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 911f02073b..aedd1d7683 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.14 2024/03/28 01:49:29 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.15 2024/03/28 01:57:00 jsing Exp $
2 2
3# i386-specific libcrypto build rules 3# i386-specific libcrypto build rules
4 4
@@ -29,7 +29,6 @@ SSLASM+= modes ghash-x86
29CFLAGS+= -DHAVE_RC4_INTERNAL 29CFLAGS+= -DHAVE_RC4_INTERNAL
30CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL 30CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL
31SSLASM+= rc4 rc4-586 31SSLASM+= rc4 rc4-586
32SRCS+= rc4.c
33# sha 32# sha
34CFLAGS+= -DSHA1_ASM 33CFLAGS+= -DSHA1_ASM
35SSLASM+= sha sha1-586 34SSLASM+= sha sha1-586
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
index 30a4047e34..b3a9406f40 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.10 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 01:57:00 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# rc4
16SRCS+= rc4.c
17# sha 15# sha
18SSLASM+= sha sha1-mips sha1-mips 16SSLASM+= sha sha1-mips sha1-mips
19CFLAGS+= -DSHA1_ASM 17CFLAGS+= -DSHA1_ASM
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index c89af9b0c0..9011d0b5e9 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.7 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.8 2024/03/28 01:57:00 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# rc4
18SRCS+= rc4.c
19# sha 17# sha
20CFLAGS+= -DSHA1_ASM 18CFLAGS+= -DSHA1_ASM
21SSLASM+= sha sha1-ppc sha1-ppc 19SSLASM+= sha sha1-ppc sha1-ppc
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index 0ce671ab31..f45bb013e3 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.9 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:57:00 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# rc4
18SRCS+= rc4.c
19# sha 17# sha
20#CFLAGS+= -DSHA1_ASM 18#CFLAGS+= -DSHA1_ASM
21#SSLASM+= sha sha1-ppc sha1-ppc 19#SSLASM+= sha sha1-ppc sha1-ppc
diff --git a/src/lib/libcrypto/arch/riscv64/Makefile.inc b/src/lib/libcrypto/arch/riscv64/Makefile.inc
index 7807da6e43..909cc21829 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.5 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.6 2024/03/28 01:57:00 jsing Exp $
2 2
3# riscv64 libcrypto build rules 3# riscv64 libcrypto build rules
4 4
@@ -11,8 +11,5 @@ SRCS+= camellia.c
11SRCS+= cmll_cbc.c 11SRCS+= cmll_cbc.c
12SRCS+= cmll_misc.c 12SRCS+= cmll_misc.c
13 13
14# rc4
15SRCS+= rc4.c
16
17# whrlpool 14# whrlpool
18SRCS+= wp_block.c 15SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
index 1c596ebea3..b34a66e226 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.12 2024/03/28 01:41:16 jsing Exp $ 1# $OpenBSD: Makefile.inc,v 1.13 2024/03/28 01:57:00 jsing Exp $
2 2
3# sparc64-specific libcrypto build rules 3# sparc64-specific libcrypto build rules
4 4
@@ -12,8 +12,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
12# modes 12# modes
13CFLAGS+= -DGHASH_ASM 13CFLAGS+= -DGHASH_ASM
14SSLASM+= modes ghash-sparcv9 ghash-sparcv9 14SSLASM+= modes ghash-sparcv9 ghash-sparcv9
15# rc4
16SRCS+= rc4.c
17# sha 15# sha
18SSLASM+= sha sha1-sparcv9 sha1-sparcv9 16SSLASM+= sha sha1-sparcv9 sha1-sparcv9
19CFLAGS+= -DSHA1_ASM 17CFLAGS+= -DSHA1_ASM
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 05:39:49 +0000