From bf7623e1522a5c2e444410b70b80a536640782c3 Mon Sep 17 00:00:00 2001 From: jsing Date: Thu, 28 Mar 2024 01:57:00 +0000 Subject: [PATCH] Move rc4.c to primary Makefile. This is now built on all platforms. --- lib/libcrypto/Makefile | 5 ++++- lib/libcrypto/arch/aarch64/Makefile.inc | 4 +--- lib/libcrypto/arch/alpha/Makefile.inc | 4 +--- lib/libcrypto/arch/amd64/Makefile.inc | 3 +-- lib/libcrypto/arch/arm/Makefile.inc | 2 -- lib/libcrypto/arch/hppa/Makefile.inc | 4 +--- lib/libcrypto/arch/i386/Makefile.inc | 3 +-- lib/libcrypto/arch/mips64/Makefile.inc | 4 +--- lib/libcrypto/arch/powerpc/Makefile.inc | 4 +--- lib/libcrypto/arch/powerpc64/Makefile.inc | 4 +--- lib/libcrypto/arch/riscv64/Makefile.inc | 5 +---- lib/libcrypto/arch/sparc64/Makefile.inc | 4 +--- 12 files changed, 14 insertions(+), 32 deletions(-) diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 447a8f65b52..a794e8b10f0 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.181 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile,v 1.182 2024/03/28 01:57:00 jsing Exp $ LIB= crypto LIBREBUILD=y @@ -492,6 +492,9 @@ SRCS+= rc2_skey.c SRCS+= rc2cfb64.c SRCS+= rc2ofb64.c +# rc4/ +SRCS+= rc4.c + # ripemd/ SRCS+= ripemd.c diff --git a/lib/libcrypto/arch/aarch64/Makefile.inc b/lib/libcrypto/arch/aarch64/Makefile.inc index feb11a1256b..d9ab7789bbf 100644 --- a/lib/libcrypto/arch/aarch64/Makefile.inc +++ b/lib/libcrypto/arch/aarch64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:57:00 jsing Exp $ # aarch64-specific libcrypto build rules @@ -8,8 +8,6 @@ SRCS+= aes_core.c aes_cbc.c # camellia SRCS+= camellia.c cmll_cbc.c cmll_misc.c # modes -# rc4 -SRCS+= rc4.c # sha # whrlpool SRCS+= wp_block.c diff --git a/lib/libcrypto/arch/alpha/Makefile.inc b/lib/libcrypto/arch/alpha/Makefile.inc index 5ebc9833b91..2a3bf263b1f 100644 --- a/lib/libcrypto/arch/alpha/Makefile.inc +++ b/lib/libcrypto/arch/alpha/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:57:00 jsing Exp $ # alpha-specific libcrypto build rules @@ -12,8 +12,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c # modes CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-alpha -# rc4 -SRCS+= rc4.c # sha CFLAGS+= -DSHA1_ASM SSLASM+= sha sha1-alpha diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc index 617b9feb9ad..40ba3c063c4 100644 --- a/lib/libcrypto/arch/amd64/Makefile.inc +++ b/lib/libcrypto/arch/amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.17 2024/03/28 01:49:29 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2024/03/28 01:57:00 jsing Exp $ # amd64-specific libcrypto build rules @@ -49,7 +49,6 @@ SSLASM+= modes ghash-x86_64 CFLAGS+= -DHAVE_RC4_INTERNAL CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL SSLASM+= rc4 rc4-x86_64 -SRCS+= rc4.c # ripemd # sha CFLAGS+= -DSHA1_ASM diff --git a/lib/libcrypto/arch/arm/Makefile.inc b/lib/libcrypto/arch/arm/Makefile.inc index e30a1a87904..443fe9e6478 100644 --- a/lib/libcrypto/arch/arm/Makefile.inc +++ b/lib/libcrypto/arch/arm/Makefile.inc @@ -14,8 +14,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c # modes CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-armv4 -# rc4 -SRCS+= rc4.c # sha CFLAGS+= -DSHA1_ASM SSLASM+= sha sha1-armv4-large diff --git a/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc index 3668d2ffe7e..84128559ced 100644 --- a/lib/libcrypto/arch/hppa/Makefile.inc +++ b/lib/libcrypto/arch/hppa/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.18 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.19 2024/03/28 01:57:00 jsing Exp $ # hppa-specific libcrypto build rules @@ -14,8 +14,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c # modes CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-parisc ghash-parisc -# rc4 -SRCS+= rc4.c # sha CFLAGS+= -DSHA1_ASM SSLASM+= sha sha1-parisc sha1-parisc diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc index 911f02073ba..aedd1d7683b 100644 --- a/lib/libcrypto/arch/i386/Makefile.inc +++ b/lib/libcrypto/arch/i386/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.14 2024/03/28 01:49:29 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.15 2024/03/28 01:57:00 jsing Exp $ # i386-specific libcrypto build rules @@ -29,7 +29,6 @@ SSLASM+= modes ghash-x86 CFLAGS+= -DHAVE_RC4_INTERNAL CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL SSLASM+= rc4 rc4-586 -SRCS+= rc4.c # sha CFLAGS+= -DSHA1_ASM SSLASM+= sha sha1-586 diff --git a/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc index 30a4047e34a..b3a9406f407 100644 --- a/lib/libcrypto/arch/mips64/Makefile.inc +++ b/lib/libcrypto/arch/mips64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 01:57:00 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 -# rc4 -SRCS+= rc4.c # sha SSLASM+= sha sha1-mips sha1-mips CFLAGS+= -DSHA1_ASM diff --git a/lib/libcrypto/arch/powerpc/Makefile.inc b/lib/libcrypto/arch/powerpc/Makefile.inc index c89af9b0c03..9011d0b5e9d 100644 --- a/lib/libcrypto/arch/powerpc/Makefile.inc +++ b/lib/libcrypto/arch/powerpc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2024/03/28 01:57:00 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 -# rc4 -SRCS+= rc4.c # sha CFLAGS+= -DSHA1_ASM SSLASM+= sha sha1-ppc sha1-ppc diff --git a/lib/libcrypto/arch/powerpc64/Makefile.inc b/lib/libcrypto/arch/powerpc64/Makefile.inc index 0ce671ab311..f45bb013e3d 100644 --- a/lib/libcrypto/arch/powerpc64/Makefile.inc +++ b/lib/libcrypto/arch/powerpc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 01:57:00 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 -# rc4 -SRCS+= rc4.c # sha #CFLAGS+= -DSHA1_ASM #SSLASM+= sha sha1-ppc sha1-ppc diff --git a/lib/libcrypto/arch/riscv64/Makefile.inc b/lib/libcrypto/arch/riscv64/Makefile.inc index 7807da6e43e..909cc218294 100644 --- a/lib/libcrypto/arch/riscv64/Makefile.inc +++ b/lib/libcrypto/arch/riscv64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2024/03/28 01:57:00 jsing Exp $ # riscv64 libcrypto build rules @@ -11,8 +11,5 @@ SRCS+= camellia.c SRCS+= cmll_cbc.c SRCS+= cmll_misc.c -# rc4 -SRCS+= rc4.c - # whrlpool SRCS+= wp_block.c diff --git a/lib/libcrypto/arch/sparc64/Makefile.inc b/lib/libcrypto/arch/sparc64/Makefile.inc index 1c596ebea36..b34a66e2264 100644 --- a/lib/libcrypto/arch/sparc64/Makefile.inc +++ b/lib/libcrypto/arch/sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.12 2024/03/28 01:41:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2024/03/28 01:57:00 jsing Exp $ # sparc64-specific libcrypto build rules @@ -12,8 +12,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c # modes CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-sparcv9 ghash-sparcv9 -# rc4 -SRCS+= rc4.c # sha SSLASM+= sha sha1-sparcv9 sha1-sparcv9 CFLAGS+= -DSHA1_ASM -- 2.20.1