summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-03-09 15:42:19 +0000
committertb <>2025-03-09 15:42:19 +0000
commitd6fd6c5b95d3120cc1ae676084a2311cce900c11 (patch)
tree7fa40715bb794969199a53302560150e99999441
parent815dfad45fb21455544f1076aeb41edc3805817d (diff)
downloadopenbsd-d6fd6c5b95d3120cc1ae676084a2311cce900c11.tar.gz
openbsd-d6fd6c5b95d3120cc1ae676084a2311cce900c11.tar.bz2
openbsd-d6fd6c5b95d3120cc1ae676084a2311cce900c11.zip
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
-rw-r--r--src/lib/libcrypto/Symbols.list2
-rw-r--r--src/lib/libcrypto/ec/ec.h6
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c25
-rw-r--r--src/lib/libcrypto/hidden/openssl/ec.h4
4 files changed, 3 insertions, 34 deletions
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
961EC_POINT_set_compressed_coordinates 961EC_POINT_set_compressed_coordinates
962EC_POINT_set_compressed_coordinates_GFp 962EC_POINT_set_compressed_coordinates_GFp
963EC_POINT_set_to_infinity 963EC_POINT_set_to_infinity
964EC_POINTs_make_affine
965EC_POINTs_mul
966EC_curve_nid2nist 964EC_curve_nid2nist
967EC_curve_nist2nid 965EC_curve_nist2nid
968EC_get_builtin_curves 966EC_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 @@
1/* $OpenBSD: ec.h,v 1.53 2025/03/09 15:39:39 tb Exp $ */ 1/* $OpenBSD: ec.h,v 1.54 2025/03/09 15:42:19 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -204,10 +204,6 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
204 BN_CTX *ctx); 204 BN_CTX *ctx);
205 205
206int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx); 206int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx);
207int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[],
208 BN_CTX *ctx);
209int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
210 size_t num, const EC_POINT *p[], const BIGNUM *m[], BN_CTX *ctx);
211int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, 207int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
212 const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx); 208 const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
213 209
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 @@
1/* $OpenBSD: ec_lib.c,v 1.120 2025/03/09 15:39:39 tb Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.121 2025/03/09 15:42:19 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -1362,26 +1362,3 @@ EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *g_scalar,
1362 return ret; 1362 return ret;
1363} 1363}
1364LCRYPTO_ALIAS(EC_POINT_mul); 1364LCRYPTO_ALIAS(EC_POINT_mul);
1365
1366/*
1367 * XXX - remove everything below in the next bump
1368 */
1369
1370int
1371EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[],
1372 BN_CTX *ctx_in)
1373{
1374 ECerror(ERR_R_DISABLED);
1375 return 0;
1376}
1377LCRYPTO_ALIAS(EC_POINTs_make_affine);
1378
1379int
1380EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
1381 size_t num, const EC_POINT *points[], const BIGNUM *scalars[],
1382 BN_CTX *ctx_in)
1383{
1384 ECerror(ERR_R_DISABLED);
1385 return 0;
1386}
1387LCRYPTO_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 @@
1/* $OpenBSD: ec.h,v 1.11 2025/03/09 15:39:39 tb Exp $ */ 1/* $OpenBSD: ec.h,v 1.12 2025/03/09 15:42:19 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -73,8 +73,6 @@ LCRYPTO_USED(EC_POINT_is_at_infinity);
73LCRYPTO_USED(EC_POINT_is_on_curve); 73LCRYPTO_USED(EC_POINT_is_on_curve);
74LCRYPTO_USED(EC_POINT_cmp); 74LCRYPTO_USED(EC_POINT_cmp);
75LCRYPTO_USED(EC_POINT_make_affine); 75LCRYPTO_USED(EC_POINT_make_affine);
76LCRYPTO_USED(EC_POINTs_make_affine);
77LCRYPTO_USED(EC_POINTs_mul);
78LCRYPTO_USED(EC_POINT_mul); 76LCRYPTO_USED(EC_POINT_mul);
79LCRYPTO_USED(EC_GROUP_get_basis_type); 77LCRYPTO_USED(EC_GROUP_get_basis_type);
80LCRYPTO_USED(d2i_ECPKParameters); 78LCRYPTO_USED(d2i_ECPKParameters);