From 538936a6c977803d4e15c8449c956ab3c5d69d86 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 25 Jan 2025 13:15:21 +0000 Subject: Garbage collect field_type member of the EC methods ok jsing --- src/lib/libcrypto/ec/ec_local.h | 4 +--- src/lib/libcrypto/ec/ecp_methods.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 684f6d2e90..d1e3c1fa4a 100644 --- a/src/lib/libcrypto/ec/ec_local.h +++ b/src/lib/libcrypto/ec/ec_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_local.h,v 1.64 2025/01/25 10:37:50 tb Exp $ */ +/* $OpenBSD: ec_local.h,v 1.65 2025/01/25 13:15:21 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -80,8 +80,6 @@ __BEGIN_HIDDEN_DECLS struct ec_method_st { - int field_type; - int (*group_set_curve)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *); int (*group_get_curve)(const EC_GROUP *, BIGNUM *p, BIGNUM *a, diff --git a/src/lib/libcrypto/ec/ecp_methods.c b/src/lib/libcrypto/ec/ecp_methods.c index 8bcff77d0a..ad975cb646 100644 --- a/src/lib/libcrypto/ec/ecp_methods.c +++ b/src/lib/libcrypto/ec/ecp_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_methods.c,v 1.41 2025/01/22 12:54:40 tb Exp $ */ +/* $OpenBSD: ecp_methods.c,v 1.42 2025/01/25 13:15:21 tb Exp $ */ /* Includes code written by Lenka Fibikova * for the OpenSSL project. * Includes code written by Bodo Moeller for the OpenSSL project. @@ -1291,7 +1291,6 @@ ec_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, } static const EC_METHOD ec_GFp_simple_method = { - .field_type = NID_X9_62_prime_field, .group_set_curve = ec_group_set_curve, .group_get_curve = ec_group_get_curve, .point_is_on_curve = ec_point_is_on_curve, @@ -1316,7 +1315,6 @@ EC_GFp_simple_method(void) LCRYPTO_ALIAS(EC_GFp_simple_method); static const EC_METHOD ec_GFp_mont_method = { - .field_type = NID_X9_62_prime_field, .group_set_curve = ec_mont_group_set_curve, .group_get_curve = ec_group_get_curve, .point_is_on_curve = ec_point_is_on_curve, -- cgit v1.2.3-55-g6feb