From 578c3ea3ea6462d6153054069f062a54f8564900 Mon Sep 17 00:00:00 2001 From: jsing Date: Wed, 27 Mar 2024 12:54:42 +0000 Subject: [PATCH] Consolidate rc4 code. Discussed with tb@ --- lib/libcrypto/Makefile | 5 +- lib/libcrypto/arch/aarch64/Makefile.inc | 4 +- lib/libcrypto/arch/alpha/Makefile.inc | 4 +- lib/libcrypto/arch/arm/Makefile.inc | 2 +- lib/libcrypto/arch/hppa/Makefile.inc | 4 +- 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 +- lib/libcrypto/rc4/{rc4_enc.c => rc4.c} | 32 +++++++- lib/libcrypto/rc4/rc4_skey.c | 97 ----------------------- 12 files changed, 50 insertions(+), 119 deletions(-) rename lib/libcrypto/rc4/{rc4_enc.c => rc4.c} (93%) delete mode 100644 lib/libcrypto/rc4/rc4_skey.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 606dc617925..b57b1fd36cb 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.177 2024/03/27 11:24:15 jsing Exp $ +# $OpenBSD: Makefile,v 1.178 2024/03/27 12:54:42 jsing Exp $ LIB= crypto LIBREBUILD=y @@ -796,8 +796,7 @@ SRCS+= cmll_cbc.c SRCS+= cmll_misc.c SRCS+= des_enc.c SRCS+= fcrypt_b.c -SRCS+= rc4_enc.c -SRCS+= rc4_skey.c +SRCS+= rc4.c SRCS+= wp_block.c .endif diff --git a/lib/libcrypto/arch/aarch64/Makefile.inc b/lib/libcrypto/arch/aarch64/Makefile.inc index bf332428b5a..c9bc4c17015 100644 --- a/lib/libcrypto/arch/aarch64/Makefile.inc +++ b/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/lib/libcrypto/arch/alpha/Makefile.inc b/lib/libcrypto/arch/alpha/Makefile.inc index 20bc246d461..52618fdb1d1 100644 --- a/lib/libcrypto/arch/alpha/Makefile.inc +++ b/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/lib/libcrypto/arch/arm/Makefile.inc b/lib/libcrypto/arch/arm/Makefile.inc index ae57ae0eecc..a0b1a90df98 100644 --- a/lib/libcrypto/arch/arm/Makefile.inc +++ b/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/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc index 5454a4e7ae6..75bb288c91d 100644 --- a/lib/libcrypto/arch/hppa/Makefile.inc +++ b/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/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc index 403c9d32782..e13906e954a 100644 --- a/lib/libcrypto/arch/mips64/Makefile.inc +++ b/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/lib/libcrypto/arch/powerpc/Makefile.inc b/lib/libcrypto/arch/powerpc/Makefile.inc index 86ea364038e..76d42f9e875 100644 --- a/lib/libcrypto/arch/powerpc/Makefile.inc +++ b/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/lib/libcrypto/arch/powerpc64/Makefile.inc b/lib/libcrypto/arch/powerpc64/Makefile.inc index 8816f0d29c6..5abddf2c9b5 100644 --- a/lib/libcrypto/arch/powerpc64/Makefile.inc +++ b/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/lib/libcrypto/arch/riscv64/Makefile.inc b/lib/libcrypto/arch/riscv64/Makefile.inc index e0d7e1863d5..7d426ae9bb6 100644 --- a/lib/libcrypto/arch/riscv64/Makefile.inc +++ b/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/lib/libcrypto/arch/sparc64/Makefile.inc b/lib/libcrypto/arch/sparc64/Makefile.inc index dcc9033f50a..12003fa6c5c 100644 --- a/lib/libcrypto/arch/sparc64/Makefile.inc +++ b/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 diff --git a/lib/libcrypto/rc4/rc4_enc.c b/lib/libcrypto/rc4/rc4.c similarity index 93% rename from lib/libcrypto/rc4/rc4_enc.c rename to lib/libcrypto/rc4/rc4.c index fdae87219ef..bbf7c3ae4e1 100644 --- a/lib/libcrypto/rc4/rc4_enc.c +++ b/lib/libcrypto/rc4/rc4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rc4_enc.c,v 1.19 2024/03/27 12:14:35 jsing Exp $ */ +/* $OpenBSD: rc4.c,v 1.8 2024/03/27 12:54:42 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -251,3 +251,33 @@ RC4(RC4_KEY *key, size_t len, const unsigned char *indata, key->x = x; key->y = y; } + +void +RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) +{ + RC4_INT tmp; + int id1, id2; + RC4_INT *d; + unsigned int i; + + d = &(key->data[0]); + key->x = 0; + key->y = 0; + id1 = id2 = 0; + +#define SK_LOOP(d,n) { \ + tmp=d[(n)]; \ + id2 = (data[id1] + tmp + id2) & 0xff; \ + if (++id1 == len) id1=0; \ + d[(n)]=d[id2]; \ + d[id2]=tmp; } + + for (i = 0; i < 256; i++) + d[i] = i; + for (i = 0; i < 256; i += 4) { + SK_LOOP(d, i + 0); + SK_LOOP(d, i + 1); + SK_LOOP(d, i + 2); + SK_LOOP(d, i + 3); + } +} diff --git a/lib/libcrypto/rc4/rc4_skey.c b/lib/libcrypto/rc4/rc4_skey.c deleted file mode 100644 index d0c45645a10..00000000000 --- a/lib/libcrypto/rc4/rc4_skey.c +++ /dev/null @@ -1,97 +0,0 @@ -/* $OpenBSD: rc4_skey.c,v 1.17 2024/03/27 12:14:35 jsing Exp $ */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include - -/* RC4 as implemented from a posting from - * Newsgroups: sci.crypt - * From: sterndark@netcom.com (David Sterndark) - * Subject: RC4 Algorithm revealed. - * Message-ID: - * Date: Wed, 14 Sep 1994 06:35:31 GMT - */ - -void -RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) -{ - RC4_INT tmp; - int id1, id2; - RC4_INT *d; - unsigned int i; - - d = &(key->data[0]); - key->x = 0; - key->y = 0; - id1 = id2 = 0; - -#define SK_LOOP(d,n) { \ - tmp=d[(n)]; \ - id2 = (data[id1] + tmp + id2) & 0xff; \ - if (++id1 == len) id1=0; \ - d[(n)]=d[id2]; \ - d[id2]=tmp; } - - for (i = 0; i < 256; i++) - d[i] = i; - for (i = 0; i < 256; i += 4) { - SK_LOOP(d, i + 0); - SK_LOOP(d, i + 1); - SK_LOOP(d, i + 2); - SK_LOOP(d, i + 3); - } -} -- 2.20.1