diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec_lib.c | 25 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/ec.h | 4 |
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 | |||
961 | EC_POINT_set_compressed_coordinates | 961 | EC_POINT_set_compressed_coordinates |
962 | EC_POINT_set_compressed_coordinates_GFp | 962 | EC_POINT_set_compressed_coordinates_GFp |
963 | EC_POINT_set_to_infinity | 963 | EC_POINT_set_to_infinity |
964 | EC_POINTs_make_affine | ||
965 | EC_POINTs_mul | ||
966 | EC_curve_nid2nist | 964 | EC_curve_nid2nist |
967 | EC_curve_nist2nid | 965 | EC_curve_nist2nid |
968 | EC_get_builtin_curves | 966 | 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 @@ | |||
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 | ||
206 | int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx); | 206 | int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx); |
207 | int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], | ||
208 | BN_CTX *ctx); | ||
209 | int 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); | ||
211 | int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, | 207 | int 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 | } |
1364 | LCRYPTO_ALIAS(EC_POINT_mul); | 1364 | LCRYPTO_ALIAS(EC_POINT_mul); |
1365 | |||
1366 | /* | ||
1367 | * XXX - remove everything below in the next bump | ||
1368 | */ | ||
1369 | |||
1370 | int | ||
1371 | EC_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 | } | ||
1377 | LCRYPTO_ALIAS(EC_POINTs_make_affine); | ||
1378 | |||
1379 | int | ||
1380 | EC_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 | } | ||
1387 | 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 @@ | |||
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); | |||
73 | LCRYPTO_USED(EC_POINT_is_on_curve); | 73 | LCRYPTO_USED(EC_POINT_is_on_curve); |
74 | LCRYPTO_USED(EC_POINT_cmp); | 74 | LCRYPTO_USED(EC_POINT_cmp); |
75 | LCRYPTO_USED(EC_POINT_make_affine); | 75 | LCRYPTO_USED(EC_POINT_make_affine); |
76 | LCRYPTO_USED(EC_POINTs_make_affine); | ||
77 | LCRYPTO_USED(EC_POINTs_mul); | ||
78 | LCRYPTO_USED(EC_POINT_mul); | 76 | LCRYPTO_USED(EC_POINT_mul); |
79 | LCRYPTO_USED(EC_GROUP_get_basis_type); | 77 | LCRYPTO_USED(EC_GROUP_get_basis_type); |
80 | LCRYPTO_USED(d2i_ECPKParameters); | 78 | LCRYPTO_USED(d2i_ECPKParameters); |