From 2caf68e3ec46ff4ba172978eb728e2aa23948684 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 14 Jan 2023 15:45:44 +0000
Subject: 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@
---
 src/lib/libcrypto/arch/amd64/Makefile.inc   | 6 +-----
 src/lib/libcrypto/arch/arm/Makefile.inc     | 4 ----
 src/lib/libcrypto/arch/i386/Makefile.inc    | 6 +-----
 src/lib/libcrypto/arch/sparc64/Makefile.inc | 6 +-----
 4 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'src/lib/libcrypto/arch')

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 @@
-# $OpenBSD: Makefile.inc,v 1.8 2017/08/20 17:53:13 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2023/01/14 15:45:43 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -31,10 +31,6 @@ SRCS+=	cmll_misc.c
 SSLASM+= camellia cmll-x86_64
 # des
 SRCS+= des_enc.c fcrypt_b.c
-# ec
-#CFLAGS+= -DECP_NISTZ256_ASM
-#SRCS+=	ecp_nistz256.c
-#SSLASM+= ec ecp_nistz256-x86_64
 # md5
 CFLAGS+= -DMD5_ASM
 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
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # des
 SRCS+= des_enc.c fcrypt_b.c
-# # ec
-# CFLAGS+= -DECP_NISTZ256_ASM
-# SRCS+=	ecp_nistz256.c
-# SSLASM+= ec ecp_nistz256-armv4
 # modes
 CFLAGS+= -DGHASH_ASM
 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 @@
-# $OpenBSD: Makefile.inc,v 1.6 2017/08/20 17:53:13 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2023/01/14 15:45:43 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -28,10 +28,6 @@ SSLASM+= camellia cmll-x86
 # des
 SRCS+= fcrypt_b.c
 SSLASM+= des des-586
-# # ec
-# CFLAGS+= -DECP_NISTZ256_ASM
-# SRCS+=	ecp_nistz256.c
-# SSLASM+= ec ecp_nistz256-x86
 # md5
 CFLAGS+= -DMD5_ASM
 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 @@
-# $OpenBSD: Makefile.inc,v 1.6 2023/01/13 17:27:26 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2023/01/14 15:45:43 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
@@ -18,10 +18,6 @@ SRCS+= des_enc-sparc.S
 GENERATED+= des_enc-sparc.S
 des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4
 	m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET}
-# # ec
-# CFLAGS+= -DECP_NISTZ256_ASM
-# SRCS+=	ecp_nistz256.c
-# SSLASM+= ec ecp_nistz256-sparcv9
 # modes
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-sparcv9 ghash-sparcv9
-- 
cgit v1.2.3-55-g6feb