diff options
author | jsing <> | 2024-03-27 12:54:42 +0000 |
---|---|---|
committer | jsing <> | 2024-03-27 12:54:42 +0000 |
commit | 139a4095bb73b0cec0c6e513fb6c5321e9308b8b (patch) | |
tree | 6b1943c4f5515896596487d1c4ab719428e797c1 /src/lib/libcrypto/arch | |
parent | fa47f9b2c9e10ca57d1333a9d9d84269455b0b4d (diff) | |
download | openbsd-139a4095bb73b0cec0c6e513fb6c5321e9308b8b.tar.gz openbsd-139a4095bb73b0cec0c6e513fb6c5321e9308b8b.tar.bz2 openbsd-139a4095bb73b0cec0c6e513fb6c5321e9308b8b.zip |
Consolidate rc4 code.
Discussed with tb@
Diffstat (limited to 'src/lib/libcrypto/arch')
-rw-r--r-- | src/lib/libcrypto/arch/aarch64/Makefile.inc | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/alpha/Makefile.inc | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/arm/Makefile.inc | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/hppa/Makefile.inc | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/mips64/Makefile.inc | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/powerpc/Makefile.inc | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/powerpc64/Makefile.inc | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/riscv64/Makefile.inc | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/sparc64/Makefile.inc | 4 |
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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.6 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.7 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # aarch64-specific libcrypto build rules | 3 | # aarch64-specific libcrypto build rules |
4 | 4 | ||
@@ -11,7 +11,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c | |||
11 | SRCS+= des_enc.c fcrypt_b.c | 11 | SRCS+= des_enc.c fcrypt_b.c |
12 | # modes | 12 | # modes |
13 | # rc4 | 13 | # rc4 |
14 | SRCS+= rc4_enc.c rc4_skey.c | 14 | SRCS+= rc4.c |
15 | # sha | 15 | # sha |
16 | # whrlpool | 16 | # whrlpool |
17 | SRCS+= wp_block.c | 17 | 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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # alpha-specific libcrypto build rules | 3 | # alpha-specific libcrypto build rules |
4 | 4 | ||
@@ -15,7 +15,7 @@ SRCS+= des_enc.c fcrypt_b.c | |||
15 | CFLAGS+= -DGHASH_ASM | 15 | CFLAGS+= -DGHASH_ASM |
16 | SSLASM+= modes ghash-alpha | 16 | SSLASM+= modes ghash-alpha |
17 | # rc4 | 17 | # rc4 |
18 | SRCS+= rc4_enc.c rc4_skey.c | 18 | SRCS+= rc4.c |
19 | # sha | 19 | # sha |
20 | CFLAGS+= -DSHA1_ASM | 20 | CFLAGS+= -DSHA1_ASM |
21 | SSLASM+= sha sha1-alpha | 21 | 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 | |||
17 | CFLAGS+= -DGHASH_ASM | 17 | CFLAGS+= -DGHASH_ASM |
18 | SSLASM+= modes ghash-armv4 | 18 | SSLASM+= modes ghash-armv4 |
19 | # rc4 | 19 | # rc4 |
20 | SRCS+= rc4_enc.c rc4_skey.c | 20 | SRCS+= rc4.c |
21 | # sha | 21 | # sha |
22 | CFLAGS+= -DSHA1_ASM | 22 | CFLAGS+= -DSHA1_ASM |
23 | SSLASM+= sha sha1-armv4-large | 23 | 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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.15 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.16 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # hppa-specific libcrypto build rules | 3 | # hppa-specific libcrypto build rules |
4 | 4 | ||
@@ -20,7 +20,7 @@ SSLASM+= modes ghash-parisc ghash-parisc | |||
20 | .if 0 # about 35% slower than C code | 20 | .if 0 # about 35% slower than C code |
21 | SSLASM+= rc4 rc4-parisc rc4-parisc | 21 | SSLASM+= rc4 rc4-parisc rc4-parisc |
22 | .else | 22 | .else |
23 | SRCS+= rc4_enc.c rc4_skey.c | 23 | SRCS+= rc4.c |
24 | .endif | 24 | .endif |
25 | # sha | 25 | # sha |
26 | CFLAGS+= -DSHA1_ASM | 26 | 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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.8 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.9 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # mips64-specific libcrypto build rules | 3 | # mips64-specific libcrypto build rules |
4 | 4 | ||
@@ -15,7 +15,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c | |||
15 | # des | 15 | # des |
16 | SRCS+= des_enc.c fcrypt_b.c | 16 | SRCS+= des_enc.c fcrypt_b.c |
17 | # rc4 | 17 | # rc4 |
18 | SRCS+= rc4_enc.c rc4_skey.c | 18 | SRCS+= rc4.c |
19 | # sha | 19 | # sha |
20 | SSLASM+= sha sha1-mips sha1-mips | 20 | SSLASM+= sha sha1-mips sha1-mips |
21 | CFLAGS+= -DSHA1_ASM | 21 | 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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.5 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.6 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # powerpc-specific libcrypto build rules | 3 | # powerpc-specific libcrypto build rules |
4 | 4 | ||
@@ -17,7 +17,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c | |||
17 | # des | 17 | # des |
18 | SRCS+= des_enc.c fcrypt_b.c | 18 | SRCS+= des_enc.c fcrypt_b.c |
19 | # rc4 | 19 | # rc4 |
20 | SRCS+= rc4_enc.c rc4_skey.c | 20 | SRCS+= rc4.c |
21 | # sha | 21 | # sha |
22 | CFLAGS+= -DSHA1_ASM | 22 | CFLAGS+= -DSHA1_ASM |
23 | SSLASM+= sha sha1-ppc sha1-ppc | 23 | 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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.8 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # powerpc-specific libcrypto build rules | 3 | # powerpc-specific libcrypto build rules |
4 | 4 | ||
@@ -17,7 +17,7 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c | |||
17 | # des | 17 | # des |
18 | SRCS+= des_enc.c fcrypt_b.c | 18 | SRCS+= des_enc.c fcrypt_b.c |
19 | # rc4 | 19 | # rc4 |
20 | SRCS+= rc4_enc.c rc4_skey.c | 20 | SRCS+= rc4.c |
21 | # sha | 21 | # sha |
22 | #CFLAGS+= -DSHA1_ASM | 22 | #CFLAGS+= -DSHA1_ASM |
23 | #SSLASM+= sha sha1-ppc sha1-ppc | 23 | #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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.3 2024/03/27 11:12:08 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.4 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # riscv64 libcrypto build rules | 3 | # riscv64 libcrypto build rules |
4 | 4 | ||
@@ -16,8 +16,7 @@ SRCS+= des_enc.c | |||
16 | SRCS+= fcrypt_b.c | 16 | SRCS+= fcrypt_b.c |
17 | 17 | ||
18 | # rc4 | 18 | # rc4 |
19 | SRCS+= rc4_enc.c | 19 | SRCS+= rc4.c |
20 | SRCS+= rc4_skey.c | ||
21 | 20 | ||
22 | # whrlpool | 21 | # whrlpool |
23 | SRCS+= wp_block.c | 22 | 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 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.9 2024/03/27 11:12:09 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.10 2024/03/27 12:54:42 jsing Exp $ |
2 | 2 | ||
3 | # sparc64-specific libcrypto build rules | 3 | # sparc64-specific libcrypto build rules |
4 | 4 | ||
@@ -19,7 +19,7 @@ des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4 | |||
19 | CFLAGS+= -DGHASH_ASM | 19 | CFLAGS+= -DGHASH_ASM |
20 | SSLASM+= modes ghash-sparcv9 ghash-sparcv9 | 20 | SSLASM+= modes ghash-sparcv9 ghash-sparcv9 |
21 | # rc4 | 21 | # rc4 |
22 | SRCS+= rc4_enc.c rc4_skey.c | 22 | SRCS+= rc4.c |
23 | # sha | 23 | # sha |
24 | SSLASM+= sha sha1-sparcv9 sha1-sparcv9 | 24 | SSLASM+= sha sha1-sparcv9 sha1-sparcv9 |
25 | CFLAGS+= -DSHA1_ASM | 25 | CFLAGS+= -DSHA1_ASM |