diff options
-rw-r--r-- | src/lib/libcrypto/ec/ec_lib.c | 11 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec_local.h | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c index cb9c19a777..6b18b82a72 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.114 2025/01/25 10:36:50 tb Exp $ */ | 1 | /* $OpenBSD: ec_lib.c,v 1.115 2025/01/25 10:37:50 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 | */ |
@@ -236,15 +236,6 @@ EC_METHOD_get_field_type(const EC_METHOD *meth) | |||
236 | } | 236 | } |
237 | LCRYPTO_ALIAS(EC_METHOD_get_field_type); | 237 | LCRYPTO_ALIAS(EC_METHOD_get_field_type); |
238 | 238 | ||
239 | int | ||
240 | ec_group_get_field_type(const EC_GROUP *group) | ||
241 | { | ||
242 | if (group == NULL || group->meth == NULL) | ||
243 | return NID_undef; | ||
244 | |||
245 | return group->meth->field_type; | ||
246 | } | ||
247 | |||
248 | /* | 239 | /* |
249 | * If there is a user-provided cofactor, sanity check and use it. Otherwise | 240 | * If there is a user-provided cofactor, sanity check and use it. Otherwise |
250 | * try computing the cofactor from generator order n and field cardinality p. | 241 | * try computing the cofactor from generator order n and field cardinality p. |
diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 84c1552c8a..684f6d2e90 100644 --- a/src/lib/libcrypto/ec/ec_local.h +++ b/src/lib/libcrypto/ec/ec_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_local.h,v 1.63 2025/01/22 09:56:58 jsing Exp $ */ | 1 | /* $OpenBSD: ec_local.h,v 1.64 2025/01/25 10:37:50 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 | */ |
@@ -177,7 +177,6 @@ int ec_wnaf_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *m, | |||
177 | const EC_POINT *point, const BIGNUM *n, BN_CTX *ctx); | 177 | const EC_POINT *point, const BIGNUM *n, BN_CTX *ctx); |
178 | 178 | ||
179 | int ec_group_is_builtin_curve(const EC_GROUP *group, int *out_nid); | 179 | int ec_group_is_builtin_curve(const EC_GROUP *group, int *out_nid); |
180 | int ec_group_get_field_type(const EC_GROUP *group); | ||
181 | 180 | ||
182 | /* | 181 | /* |
183 | * Wrappers around the unergonomic EC_POINT_{oct2point,point2oct}(). | 182 | * Wrappers around the unergonomic EC_POINT_{oct2point,point2oct}(). |