diff options
| author | jsing <> | 2023-01-14 15:45:44 +0000 |
|---|---|---|
| committer | jsing <> | 2023-01-14 15:45:44 +0000 |
| commit | 2caf68e3ec46ff4ba172978eb728e2aa23948684 (patch) | |
| tree | 2beaa725f80865b4e4c7d3384563e3ed4940579e /src/lib/libcrypto/arch | |
| parent | e182204c3487929ef9f6791554e79586f4d30335 (diff) | |
| download | openbsd-2caf68e3ec46ff4ba172978eb728e2aa23948684.tar.gz openbsd-2caf68e3ec46ff4ba172978eb728e2aa23948684.tar.bz2 openbsd-2caf68e3ec46ff4ba172978eb728e2aa23948684.zip | |
Remove unused Elliptic Curve code.
For various reasons, the ecp_nistp* and ecp_nistz* code is unused. While
ecp_nistp* was being compiled, it is disabled due to
OPENSSL_NO_EC_NISTP_64_GCC_128 being defined. On the other hand,
ecp_nistz* was not even being built.
We will bring in new versions or alternative versions of such code, if we
end up enabling it in the future. For now it is just causing complexity
(and grep noise) while trying to improve the EC code.
Discussed with tb@
Diffstat (limited to 'src/lib/libcrypto/arch')
| -rw-r--r-- | src/lib/libcrypto/arch/amd64/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/arm/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/i386/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/sparc64/Makefile.inc | 6 |
4 files changed, 3 insertions, 19 deletions
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc index 8b87562500..dc615ece1c 100644 --- a/src/lib/libcrypto/arch/amd64/Makefile.inc +++ b/src/lib/libcrypto/arch/amd64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.8 2017/08/20 17:53:13 espie Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.9 2023/01/14 15:45:43 jsing Exp $ |
| 2 | 2 | ||
| 3 | # amd64-specific libcrypto build rules | 3 | # amd64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -31,10 +31,6 @@ SRCS+= cmll_misc.c | |||
| 31 | SSLASM+= camellia cmll-x86_64 | 31 | SSLASM+= camellia cmll-x86_64 |
| 32 | # des | 32 | # des |
| 33 | SRCS+= des_enc.c fcrypt_b.c | 33 | SRCS+= des_enc.c fcrypt_b.c |
| 34 | # ec | ||
| 35 | #CFLAGS+= -DECP_NISTZ256_ASM | ||
| 36 | #SRCS+= ecp_nistz256.c | ||
| 37 | #SSLASM+= ec ecp_nistz256-x86_64 | ||
| 38 | # md5 | 34 | # md5 |
| 39 | CFLAGS+= -DMD5_ASM | 35 | CFLAGS+= -DMD5_ASM |
| 40 | SSLASM+= md5 md5-x86_64 | 36 | SSLASM+= md5 md5-x86_64 |
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc index b0e499db7b..18772332be 100644 --- a/src/lib/libcrypto/arch/arm/Makefile.inc +++ b/src/lib/libcrypto/arch/arm/Makefile.inc | |||
| @@ -18,10 +18,6 @@ SSLASM+= bn armv4-gf2m | |||
| 18 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c | 18 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c |
| 19 | # des | 19 | # des |
| 20 | SRCS+= des_enc.c fcrypt_b.c | 20 | SRCS+= des_enc.c fcrypt_b.c |
| 21 | # # ec | ||
| 22 | # CFLAGS+= -DECP_NISTZ256_ASM | ||
| 23 | # SRCS+= ecp_nistz256.c | ||
| 24 | # SSLASM+= ec ecp_nistz256-armv4 | ||
| 25 | # modes | 21 | # modes |
| 26 | CFLAGS+= -DGHASH_ASM | 22 | CFLAGS+= -DGHASH_ASM |
| 27 | SSLASM+= modes ghash-armv4 | 23 | SSLASM+= modes ghash-armv4 |
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc index 7986a0f54e..67c22262e6 100644 --- a/src/lib/libcrypto/arch/i386/Makefile.inc +++ b/src/lib/libcrypto/arch/i386/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.6 2017/08/20 17:53:13 espie Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.7 2023/01/14 15:45:43 jsing Exp $ |
| 2 | 2 | ||
| 3 | # i386-specific libcrypto build rules | 3 | # i386-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -28,10 +28,6 @@ SSLASM+= camellia cmll-x86 | |||
| 28 | # des | 28 | # des |
| 29 | SRCS+= fcrypt_b.c | 29 | SRCS+= fcrypt_b.c |
| 30 | SSLASM+= des des-586 | 30 | SSLASM+= des des-586 |
| 31 | # # ec | ||
| 32 | # CFLAGS+= -DECP_NISTZ256_ASM | ||
| 33 | # SRCS+= ecp_nistz256.c | ||
| 34 | # SSLASM+= ec ecp_nistz256-x86 | ||
| 35 | # md5 | 31 | # md5 |
| 36 | CFLAGS+= -DMD5_ASM | 32 | CFLAGS+= -DMD5_ASM |
| 37 | SSLASM+= md5 md5-586 | 33 | SSLASM+= md5 md5-586 |
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc index 223c941f77..6ea1409c44 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.6 2023/01/13 17:27:26 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.7 2023/01/14 15:45:43 jsing Exp $ |
| 2 | 2 | ||
| 3 | # sparc64-specific libcrypto build rules | 3 | # sparc64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -18,10 +18,6 @@ SRCS+= des_enc-sparc.S | |||
| 18 | GENERATED+= des_enc-sparc.S | 18 | GENERATED+= des_enc-sparc.S |
| 19 | des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4 | 19 | des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4 |
| 20 | m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET} | 20 | m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET} |
| 21 | # # ec | ||
| 22 | # CFLAGS+= -DECP_NISTZ256_ASM | ||
| 23 | # SRCS+= ecp_nistz256.c | ||
| 24 | # SSLASM+= ec ecp_nistz256-sparcv9 | ||
| 25 | # modes | 21 | # modes |
| 26 | CFLAGS+= -DGHASH_ASM | 22 | CFLAGS+= -DGHASH_ASM |
| 27 | SSLASM+= modes ghash-sparcv9 ghash-sparcv9 | 23 | SSLASM+= modes ghash-sparcv9 ghash-sparcv9 |
