summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2025-01-25 13:15:21 +0000
committertb <>2025-01-25 13:15:21 +0000
commit538936a6c977803d4e15c8449c956ab3c5d69d86 (patch)
tree237f5fe09a6f50b3147279af88685053752f159c /src
parentc27317d514c4ad4eee1ef608f6cff14347a2f424 (diff)
downloadopenbsd-538936a6c977803d4e15c8449c956ab3c5d69d86.tar.gz
openbsd-538936a6c977803d4e15c8449c956ab3c5d69d86.tar.bz2
openbsd-538936a6c977803d4e15c8449c956ab3c5d69d86.zip
Garbage collect field_type member of the EC methods
ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ec/ec_local.h4
-rw-r--r--src/lib/libcrypto/ec/ecp_methods.c4
2 files changed, 2 insertions, 6 deletions
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 @@
1/* $OpenBSD: ec_local.h,v 1.64 2025/01/25 10:37:50 tb Exp $ */ 1/* $OpenBSD: ec_local.h,v 1.65 2025/01/25 13:15:21 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 */
@@ -80,8 +80,6 @@
80__BEGIN_HIDDEN_DECLS 80__BEGIN_HIDDEN_DECLS
81 81
82struct ec_method_st { 82struct ec_method_st {
83 int field_type;
84
85 int (*group_set_curve)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, 83 int (*group_set_curve)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a,
86 const BIGNUM *b, BN_CTX *); 84 const BIGNUM *b, BN_CTX *);
87 int (*group_get_curve)(const EC_GROUP *, BIGNUM *p, BIGNUM *a, 85 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 @@
1/* $OpenBSD: ecp_methods.c,v 1.41 2025/01/22 12:54:40 tb Exp $ */ 1/* $OpenBSD: ecp_methods.c,v 1.42 2025/01/25 13:15:21 tb Exp $ */
2/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de> 2/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
3 * for the OpenSSL project. 3 * for the OpenSSL project.
4 * Includes code written by Bodo Moeller for the OpenSSL project. 4 * 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,
1291} 1291}
1292 1292
1293static const EC_METHOD ec_GFp_simple_method = { 1293static const EC_METHOD ec_GFp_simple_method = {
1294 .field_type = NID_X9_62_prime_field,
1295 .group_set_curve = ec_group_set_curve, 1294 .group_set_curve = ec_group_set_curve,
1296 .group_get_curve = ec_group_get_curve, 1295 .group_get_curve = ec_group_get_curve,
1297 .point_is_on_curve = ec_point_is_on_curve, 1296 .point_is_on_curve = ec_point_is_on_curve,
@@ -1316,7 +1315,6 @@ EC_GFp_simple_method(void)
1316LCRYPTO_ALIAS(EC_GFp_simple_method); 1315LCRYPTO_ALIAS(EC_GFp_simple_method);
1317 1316
1318static const EC_METHOD ec_GFp_mont_method = { 1317static const EC_METHOD ec_GFp_mont_method = {
1319 .field_type = NID_X9_62_prime_field,
1320 .group_set_curve = ec_mont_group_set_curve, 1318 .group_set_curve = ec_mont_group_set_curve,
1321 .group_get_curve = ec_group_get_curve, 1319 .group_get_curve = ec_group_get_curve,
1322 .point_is_on_curve = ec_point_is_on_curve, 1320 .point_is_on_curve = ec_point_is_on_curve,