Consolidate rc4 code.

Discussed with tb@

9 files changed, 17 insertions, 18 deletions

diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
index bf332428b5..c9bc4c1701 100644
--- a/src/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 12:54:42 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
@@ -11,7 +11,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 SRCS+= des_enc.c fcrypt_b.c
 # modes
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 # whrlpool
 SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
index 20bc246d46..52618fdb1d 100644
--- a/src/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/src/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $
 
 # alpha-specific libcrypto build rules
 
@@ -15,7 +15,7 @@ SRCS+= des_enc.c fcrypt_b.c
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-alpha
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-alpha
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index ae57ae0eec..a0b1a90df9 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -17,7 +17,7 @@ SRCS+= des_enc.c fcrypt_b.c
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-armv4
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-armv4-large
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index 5454a4e7ae..75bb288c91 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2024/03/27 12:54:42 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
@@ -20,7 +20,7 @@ SSLASM+= modes ghash-parisc ghash-parisc
 .if 0   # about 35% slower than C code
 SSLASM+= rc4 rc4-parisc rc4-parisc
 .else
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 .endif
 # sha
 CFLAGS+= -DSHA1_ASM
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
index 403c9d3278..e13906e954 100644
--- a/src/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/src/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2024/03/27 12:54:42 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
@@ -15,7 +15,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # des
 SRCS+= des_enc.c fcrypt_b.c
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 SSLASM+= sha sha1-mips sha1-mips
 CFLAGS+= -DSHA1_ASM
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index 86ea364038..76d42f9e87 100644
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2024/03/27 12:54:42 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -17,7 +17,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # des
 SRCS+= des_enc.c fcrypt_b.c
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-ppc sha1-ppc
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index 8816f0d29c..5abddf2c9b 100644
--- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -17,7 +17,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # des
 SRCS+= des_enc.c fcrypt_b.c
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 #CFLAGS+= -DSHA1_ASM
 #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 e0d7e1863d..7d426ae9bb 100644
--- a/src/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/src/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2024/03/27 11:12:08 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2024/03/27 12:54:42 jsing Exp $
 
 # riscv64 libcrypto build rules
 
@@ -16,8 +16,7 @@ SRCS+= des_enc.c
 SRCS+= fcrypt_b.c
 
 # rc4
-SRCS+= rc4_enc.c
-SRCS+= rc4_skey.c
+SRCS+= rc4.c
 
 # whrlpool
 SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
index dcc9033f50..12003fa6c5 100644
--- a/src/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.9 2024/03/27 11:12:09 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2024/03/27 12:54:42 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
@@ -19,7 +19,7 @@ des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-sparcv9 ghash-sparcv9
 # rc4
-SRCS+= rc4_enc.c rc4_skey.c
+SRCS+= rc4.c
 # sha
 SSLASM+= sha sha1-sparcv9 sha1-sparcv9
 CFLAGS+= -DSHA1_ASM