summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec/ec_lib.c
diff options
context:
space:
mode:
authortb <>2025-01-01 09:57:02 +0000
committertb <>2025-01-01 09:57:02 +0000
commit183ebcd147bfd493e4856f28b1ff4c9c6dbd0730 (patch)
tree9af62a1a58881fed0768c163faef515fca142874 /src/lib/libcrypto/ec/ec_lib.c
parent4f4db522b10347e779e635569d9938a60931b0d1 (diff)
downloadopenbsd-183ebcd147bfd493e4856f28b1ff4c9c6dbd0730.tar.gz
openbsd-183ebcd147bfd493e4856f28b1ff4c9c6dbd0730.tar.bz2
openbsd-183ebcd147bfd493e4856f28b1ff4c9c6dbd0730.zip
Garbage collect .group_init()
For both in-tree methods these are just complicated ways of zeroing part of the group object. The group is allocated with calloc(), so it's all entirely pointless. ok jsing
Diffstat (limited to 'src/lib/libcrypto/ec/ec_lib.c')
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 6644c4dfc7..aeb627dfba 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.91 2024/12/12 10:02:00 tb Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.92 2025/01/01 09:57:02 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 */
@@ -84,10 +84,6 @@ EC_GROUP_new(const EC_METHOD *meth)
84 ECerror(EC_R_SLOT_FULL); 84 ECerror(EC_R_SLOT_FULL);
85 goto err; 85 goto err;
86 } 86 }
87 if (meth->group_init == NULL) {
88 ECerror(ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
89 goto err;
90 }
91 if ((group = calloc(1, sizeof(*group))) == NULL) { 87 if ((group = calloc(1, sizeof(*group))) == NULL) {
92 ECerror(ERR_R_MALLOC_FAILURE); 88 ECerror(ERR_R_MALLOC_FAILURE);
93 goto err; 89 goto err;
@@ -95,15 +91,9 @@ EC_GROUP_new(const EC_METHOD *meth)
95 91
96 group->meth = meth; 92 group->meth = meth;
97 93
98 BN_init(&group->order);
99 BN_init(&group->cofactor);
100
101 group->asn1_flag = OPENSSL_EC_NAMED_CURVE; 94 group->asn1_flag = OPENSSL_EC_NAMED_CURVE;
102 group->asn1_form = POINT_CONVERSION_UNCOMPRESSED; 95 group->asn1_form = POINT_CONVERSION_UNCOMPRESSED;
103 96
104 if (!meth->group_init(group))
105 goto err;
106
107 return group; 97 return group;
108 98
109 err: 99 err: