From d6fd6c5b95d3120cc1ae676084a2311cce900c11 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 9 Mar 2025 15:42:19 +0000
Subject: Remove EC_POINTs_* API

And another one... Completely overengineered for the sake of academic
credentials and only Ruby ever picked this garbage up. Fortunately, it's
no longer used with LibreSSL since we defanged this in 2018. The latest
version of ruby/openssl has completely removed this as part of their post
1.0.x cleanup.

ok jsing
---
 src/lib/libcrypto/Symbols.list        |  2 --
 src/lib/libcrypto/ec/ec.h             |  6 +-----
 src/lib/libcrypto/ec/ec_lib.c         | 25 +------------------------
 src/lib/libcrypto/hidden/openssl/ec.h |  4 +---
 4 files changed, 3 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index a48d870fc1..7e681aa38f 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -961,8 +961,6 @@ EC_POINT_set_affine_coordinates_GFp
 EC_POINT_set_compressed_coordinates
 EC_POINT_set_compressed_coordinates_GFp
 EC_POINT_set_to_infinity
-EC_POINTs_make_affine
-EC_POINTs_mul
 EC_curve_nid2nist
 EC_curve_nist2nid
 EC_get_builtin_curves
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index 3417df1ce9..ebee120154 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.53 2025/03/09 15:39:39 tb Exp $ */
+/* $OpenBSD: ec.h,v 1.54 2025/03/09 15:42:19 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -204,10 +204,6 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
     BN_CTX *ctx);
 
 int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx);
-int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[],
-    BN_CTX *ctx);
-int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-    size_t num, const EC_POINT *p[], const BIGNUM *m[], BN_CTX *ctx);
 int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
     const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
 
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index b9829b6a47..315a8130cf 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.120 2025/03/09 15:39:39 tb Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.121 2025/03/09 15:42:19 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -1362,26 +1362,3 @@ EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *g_scalar,
 	return ret;
 }
 LCRYPTO_ALIAS(EC_POINT_mul);
-
-/*
- * XXX - remove everything below in the next bump
- */
-
-int
-EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[],
-    BN_CTX *ctx_in)
-{
-	ECerror(ERR_R_DISABLED);
-	return 0;
-}
-LCRYPTO_ALIAS(EC_POINTs_make_affine);
-
-int
-EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-    size_t num, const EC_POINT *points[], const BIGNUM *scalars[],
-    BN_CTX *ctx_in)
-{
-	ECerror(ERR_R_DISABLED);
-	return 0;
-}
-LCRYPTO_ALIAS(EC_POINTs_mul);
diff --git a/src/lib/libcrypto/hidden/openssl/ec.h b/src/lib/libcrypto/hidden/openssl/ec.h
index 44adfc458e..31ca83f147 100644
--- a/src/lib/libcrypto/hidden/openssl/ec.h
+++ b/src/lib/libcrypto/hidden/openssl/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.11 2025/03/09 15:39:39 tb Exp $ */
+/* $OpenBSD: ec.h,v 1.12 2025/03/09 15:42:19 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -73,8 +73,6 @@ LCRYPTO_USED(EC_POINT_is_at_infinity);
 LCRYPTO_USED(EC_POINT_is_on_curve);
 LCRYPTO_USED(EC_POINT_cmp);
 LCRYPTO_USED(EC_POINT_make_affine);
-LCRYPTO_USED(EC_POINTs_make_affine);
-LCRYPTO_USED(EC_POINTs_mul);
 LCRYPTO_USED(EC_POINT_mul);
 LCRYPTO_USED(EC_GROUP_get_basis_type);
 LCRYPTO_USED(d2i_ECPKParameters);
-- 
cgit v1.2.3-55-g6feb