diff options
| author | tb <> | 2019-05-11 13:05:25 +0000 |
|---|---|---|
| committer | tb <> | 2019-05-11 13:05:25 +0000 |
| commit | 83feb7b0ecfb7abaf7c81a355c94e22c3c5440e9 (patch) | |
| tree | 79d00993a3ab50e97ff0df4c7111d5f4ec3efc65 /src/lib/libcrypto | |
| parent | 1acf1dca346bb7d5709e09f8ca115fbec8cea94e (diff) | |
| download | openbsd-83feb7b0ecfb7abaf7c81a355c94e22c3c5440e9.tar.gz openbsd-83feb7b0ecfb7abaf7c81a355c94e22c3c5440e9.tar.bz2 openbsd-83feb7b0ecfb7abaf7c81a355c94e22c3c5440e9.zip | |
Remove commented out rc5 bits
Diffstat (limited to '')
| -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/sparc/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/sparc64/Makefile.inc | 4 |
7 files changed, 6 insertions, 20 deletions
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc index 82fa9fc1f4..3b693c2ad2 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.3 2014/11/17 20:31:21 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.4 2019/05/11 13:05:24 tb Exp $ |
| 2 | 2 | ||
| 3 | # alpha-specific libcrypto build rules | 3 | # alpha-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -19,8 +19,6 @@ CFLAGS+= -DGHASH_ASM | |||
| 19 | SSLASM+= modes ghash-alpha | 19 | SSLASM+= modes ghash-alpha |
| 20 | # rc4 | 20 | # rc4 |
| 21 | SRCS+= rc4_enc.c rc4_skey.c | 21 | SRCS+= rc4_enc.c rc4_skey.c |
| 22 | ## rc5 | ||
| 23 | #SRCS+= rc5_enc.c | ||
| 24 | # sha | 22 | # sha |
| 25 | CFLAGS+= -DSHA1_ASM | 23 | CFLAGS+= -DSHA1_ASM |
| 26 | SSLASM+= sha sha1-alpha | 24 | SSLASM+= sha sha1-alpha |
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc index 76e158660a..b0e499db7b 100644 --- a/src/lib/libcrypto/arch/arm/Makefile.inc +++ b/src/lib/libcrypto/arch/arm/Makefile.inc | |||
| @@ -27,8 +27,6 @@ CFLAGS+= -DGHASH_ASM | |||
| 27 | SSLASM+= modes ghash-armv4 | 27 | SSLASM+= modes ghash-armv4 |
| 28 | # rc4 | 28 | # rc4 |
| 29 | SRCS+= rc4_enc.c rc4_skey.c | 29 | SRCS+= rc4_enc.c rc4_skey.c |
| 30 | ## rc5 | ||
| 31 | #SRCS+= rc5_enc.c | ||
| 32 | # sha | 30 | # sha |
| 33 | CFLAGS+= -DSHA1_ASM | 31 | CFLAGS+= -DSHA1_ASM |
| 34 | SSLASM+= sha sha1-armv4-large | 32 | SSLASM+= sha sha1-armv4-large |
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc index 0e18de2074..fba6342e71 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.9 2015/03/18 05:26:10 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.10 2019/05/11 13:05:25 tb Exp $ |
| 2 | 2 | ||
| 3 | # hppa-specific libcrypto build rules | 3 | # hppa-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -25,8 +25,6 @@ SSLASM+= rc4 rc4-parisc rc4-parisc | |||
| 25 | .else | 25 | .else |
| 26 | SRCS+= rc4_enc.c rc4_skey.c | 26 | SRCS+= rc4_enc.c rc4_skey.c |
| 27 | .endif | 27 | .endif |
| 28 | ## rc5 | ||
| 29 | #SRCS+= rc5_enc.c | ||
| 30 | # sha | 28 | # sha |
| 31 | CFLAGS+= -DSHA1_ASM | 29 | CFLAGS+= -DSHA1_ASM |
| 32 | SSLASM+= sha sha1-parisc sha1-parisc | 30 | SSLASM+= sha sha1-parisc sha1-parisc |
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc index b6fc8971e7..f4feb4d479 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.4 2014/12/07 15:45:44 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.5 2019/05/11 13:05:25 tb Exp $ |
| 2 | 2 | ||
| 3 | # mips64-specific libcrypto build rules | 3 | # mips64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -23,8 +23,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c | |||
| 23 | SRCS+= des_enc.c fcrypt_b.c | 23 | SRCS+= des_enc.c fcrypt_b.c |
| 24 | # rc4 | 24 | # rc4 |
| 25 | SRCS+= rc4_enc.c rc4_skey.c | 25 | SRCS+= rc4_enc.c rc4_skey.c |
| 26 | ## rc5 | ||
| 27 | #SRCS+= rc5_enc.c | ||
| 28 | # sha | 26 | # sha |
| 29 | SSLASM+= sha sha1-mips sha1-mips | 27 | SSLASM+= sha sha1-mips sha1-mips |
| 30 | CFLAGS+= -DSHA1_ASM | 28 | CFLAGS+= -DSHA1_ASM |
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc index 46790859b5..2682fc9e21 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.2 2014/11/17 20:31:22 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.3 2019/05/11 13:05:25 tb Exp $ |
| 2 | 2 | ||
| 3 | # powerpc-specific libcrypto build rules | 3 | # powerpc-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -20,8 +20,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c | |||
| 20 | SRCS+= des_enc.c fcrypt_b.c | 20 | SRCS+= des_enc.c fcrypt_b.c |
| 21 | # rc4 | 21 | # rc4 |
| 22 | SRCS+= rc4_enc.c rc4_skey.c | 22 | SRCS+= rc4_enc.c rc4_skey.c |
| 23 | ## rc5 | ||
| 24 | #SRCS+= rc5_enc.c | ||
| 25 | # sha | 23 | # sha |
| 26 | CFLAGS+= -DSHA1_ASM | 24 | CFLAGS+= -DSHA1_ASM |
| 27 | SSLASM+= sha sha1-ppc sha1-ppc | 25 | SSLASM+= sha sha1-ppc sha1-ppc |
diff --git a/src/lib/libcrypto/arch/sparc/Makefile.inc b/src/lib/libcrypto/arch/sparc/Makefile.inc index ba9954c85e..a3be433f51 100644 --- a/src/lib/libcrypto/arch/sparc/Makefile.inc +++ b/src/lib/libcrypto/arch/sparc/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.3 2019/05/11 13:05:25 tb Exp $ |
| 2 | 2 | ||
| 3 | # sparc-specific libcrypto build rules | 3 | # sparc-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -23,7 +23,5 @@ des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4 | |||
| 23 | m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET} | 23 | m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET} |
| 24 | # rc4 | 24 | # rc4 |
| 25 | SRCS+= rc4_enc.c rc4_skey.c | 25 | SRCS+= rc4_enc.c rc4_skey.c |
| 26 | ## rc5 | ||
| 27 | #SRCS+= rc5_enc.c | ||
| 28 | # whrlpool | 26 | # whrlpool |
| 29 | SRCS+= wp_block.c | 27 | SRCS+= wp_block.c |
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc index 46f79d0f41..8da30918f4 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.3 2016/11/04 18:12:14 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.4 2019/05/11 13:05:25 tb Exp $ |
| 2 | 2 | ||
| 3 | # sparc64-specific libcrypto build rules | 3 | # sparc64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -27,8 +27,6 @@ CFLAGS+= -DGHASH_ASM | |||
| 27 | SSLASM+= modes ghash-sparcv9 ghash-sparcv9 | 27 | SSLASM+= modes ghash-sparcv9 ghash-sparcv9 |
| 28 | # rc4 | 28 | # rc4 |
| 29 | SRCS+= rc4_enc.c rc4_skey.c | 29 | SRCS+= rc4_enc.c rc4_skey.c |
| 30 | ## rc5 | ||
| 31 | #SRCS+= rc5_enc.c | ||
| 32 | # sha | 30 | # sha |
| 33 | SSLASM+= sha sha1-sparcv9 sha1-sparcv9 | 31 | SSLASM+= sha sha1-sparcv9 sha1-sparcv9 |
| 34 | CFLAGS+= -DSHA1_ASM | 32 | CFLAGS+= -DSHA1_ASM |
