summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec')
-rw-r--r--src/lib/libcrypto/ec/ec2_smpl.c14
-rw-r--r--src/lib/libcrypto/ec/ec_key.c4
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c6
-rw-r--r--src/lib/libcrypto/ec/ec_print.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_smpl.c16
5 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c
index 910484fc65..c7ea0d9765 100644
--- a/src/lib/libcrypto/ec/ec2_smpl.c
+++ b/src/lib/libcrypto/ec/ec2_smpl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec2_smpl.c,v 1.30 2023/03/07 05:50:59 jsing Exp $ */ 1/* $OpenBSD: ec2_smpl.c,v 1.31 2023/03/07 09:27:10 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -107,9 +107,9 @@ ec_GF2m_simple_group_finish(EC_GROUP *group)
107static void 107static void
108ec_GF2m_simple_group_clear_finish(EC_GROUP *group) 108ec_GF2m_simple_group_clear_finish(EC_GROUP *group)
109{ 109{
110 BN_clear_free(&group->field); 110 BN_free(&group->field);
111 BN_clear_free(&group->a); 111 BN_free(&group->a);
112 BN_clear_free(&group->b); 112 BN_free(&group->b);
113 group->poly[0] = 0; 113 group->poly[0] = 0;
114 group->poly[1] = 0; 114 group->poly[1] = 0;
115 group->poly[2] = 0; 115 group->poly[2] = 0;
@@ -285,9 +285,9 @@ ec_GF2m_simple_point_finish(EC_POINT *point)
285static void 285static void
286ec_GF2m_simple_point_clear_finish(EC_POINT *point) 286ec_GF2m_simple_point_clear_finish(EC_POINT *point)
287{ 287{
288 BN_clear_free(&point->X); 288 BN_free(&point->X);
289 BN_clear_free(&point->Y); 289 BN_free(&point->Y);
290 BN_clear_free(&point->Z); 290 BN_free(&point->Z);
291 point->Z_is_one = 0; 291 point->Z_is_one = 0;
292} 292}
293 293
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index 2ef5d75d47..3799498ab1 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_key.c,v 1.30 2023/01/14 15:10:45 jsing Exp $ */ 1/* $OpenBSD: ec_key.c,v 1.31 2023/03/07 09:27:10 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -120,7 +120,7 @@ EC_KEY_free(EC_KEY *r)
120 120
121 EC_GROUP_free(r->group); 121 EC_GROUP_free(r->group);
122 EC_POINT_free(r->pub_key); 122 EC_POINT_free(r->pub_key);
123 BN_clear_free(r->priv_key); 123 BN_free(r->priv_key);
124 124
125 EC_EX_DATA_free_all_data(&r->method_data); 125 EC_EX_DATA_free_all_data(&r->method_data);
126 126
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 2a99f8d490..0e863ddfef 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.48 2023/02/07 09:00:48 tb Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.49 2023/03/07 09:27:10 jsing 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 */
@@ -149,8 +149,8 @@ EC_GROUP_clear_free(EC_GROUP *group)
149 EC_EX_DATA_clear_free_all_data(&group->extra_data); 149 EC_EX_DATA_clear_free_all_data(&group->extra_data);
150 150
151 EC_POINT_clear_free(group->generator); 151 EC_POINT_clear_free(group->generator);
152 BN_clear_free(&group->order); 152 BN_free(&group->order);
153 BN_clear_free(&group->cofactor); 153 BN_free(&group->cofactor);
154 154
155 freezero(group->seed, group->seed_len); 155 freezero(group->seed, group->seed_len);
156 freezero(group, sizeof *group); 156 freezero(group, sizeof *group);
diff --git a/src/lib/libcrypto/ec/ec_print.c b/src/lib/libcrypto/ec/ec_print.c
index 1b85e82436..faa212f502 100644
--- a/src/lib/libcrypto/ec/ec_print.c
+++ b/src/lib/libcrypto/ec/ec_print.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_print.c,v 1.9 2022/11/26 16:08:52 tb Exp $ */ 1/* $OpenBSD: ec_print.c,v 1.10 2023/03/07 09:27:10 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -172,7 +172,7 @@ EC_POINT_hex2point(const EC_GROUP *group, const char *buf,
172 172
173 ret = EC_POINT_bn2point(group, tmp_bn, point, ctx); 173 ret = EC_POINT_bn2point(group, tmp_bn, point, ctx);
174 174
175 BN_clear_free(tmp_bn); 175 BN_free(tmp_bn);
176 176
177 return ret; 177 return ret;
178} 178}
diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index 8f53b150b8..df9806445c 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_smpl.c,v 1.39 2023/03/07 05:54:40 jsing Exp $ */ 1/* $OpenBSD: ecp_smpl.c,v 1.40 2023/03/07 09:27:10 jsing 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.
@@ -102,9 +102,9 @@ ec_GFp_simple_group_finish(EC_GROUP *group)
102void 102void
103ec_GFp_simple_group_clear_finish(EC_GROUP *group) 103ec_GFp_simple_group_clear_finish(EC_GROUP *group)
104{ 104{
105 BN_clear_free(&group->field); 105 BN_free(&group->field);
106 BN_clear_free(&group->a); 106 BN_free(&group->a);
107 BN_clear_free(&group->b); 107 BN_free(&group->b);
108} 108}
109 109
110int 110int
@@ -324,9 +324,9 @@ ec_GFp_simple_point_finish(EC_POINT *point)
324void 324void
325ec_GFp_simple_point_clear_finish(EC_POINT *point) 325ec_GFp_simple_point_clear_finish(EC_POINT *point)
326{ 326{
327 BN_clear_free(&point->X); 327 BN_free(&point->X);
328 BN_clear_free(&point->Y); 328 BN_free(&point->Y);
329 BN_clear_free(&point->Z); 329 BN_free(&point->Z);
330 point->Z_is_one = 0; 330 point->Z_is_one = 0;
331} 331}
332 332
@@ -1324,7 +1324,7 @@ ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *po
1324 * locally! 1324 * locally!
1325 */ 1325 */
1326 for (i = pow2 / 2 - 1; i > 0; i--) { 1326 for (i = pow2 / 2 - 1; i > 0; i--) {
1327 BN_clear_free(heap[i]); 1327 BN_free(heap[i]);
1328 } 1328 }
1329 free(heap); 1329 free(heap);
1330 } 1330 }