summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2023-03-07 09:27:10 +0000
committerjsing <>2023-03-07 09:27:10 +0000
commitc83e0ddc66b0c990eac3283a437e4e70eabd868d (patch)
treed6ca9b239f49033751a7fb0f0185d1ad060801cf /src
parente3934d6456ddf771c623fd07240dfb4c4d7a062c (diff)
downloadopenbsd-c83e0ddc66b0c990eac3283a437e4e70eabd868d.tar.gz
openbsd-c83e0ddc66b0c990eac3283a437e4e70eabd868d.tar.bz2
openbsd-c83e0ddc66b0c990eac3283a437e4e70eabd868d.zip
Call BN_free() instead of BN_clear_free().
BN_clear_free() is a wrapper that calls BN_free() - call BN_free() directly instead. ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/bn/bn_blind.c10
-rw-r--r--src/lib/libcrypto/bn/bn_sqrt.c4
-rw-r--r--src/lib/libcrypto/dh/dh_lib.c16
-rw-r--r--src/lib/libcrypto/dsa/dsa_asn1.c6
-rw-r--r--src/lib/libcrypto/dsa/dsa_lib.c16
-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
-rw-r--r--src/lib/libcrypto/ecdsa/ecs_asn1.c6
-rw-r--r--src/lib/libcrypto/ecdsa/ecs_lib.c4
-rw-r--r--src/lib/libcrypto/ecdsa/ecs_ossl.c24
-rw-r--r--src/lib/libcrypto/gost/gostr341001_key.c10
-rw-r--r--src/lib/libcrypto/rsa/rsa_lib.c18
15 files changed, 79 insertions, 79 deletions
diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
index fbcdf1c6e7..61d0cf7a95 100644
--- a/src/lib/libcrypto/bn/bn_blind.c
+++ b/src/lib/libcrypto/bn/bn_blind.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_blind.c,v 1.19 2022/11/26 16:08:51 tb Exp $ */ 1/* $OpenBSD: bn_blind.c,v 1.20 2023/03/07 09:27:10 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -180,10 +180,10 @@ BN_BLINDING_free(BN_BLINDING *r)
180 if (r == NULL) 180 if (r == NULL)
181 return; 181 return;
182 182
183 BN_clear_free(r->A); 183 BN_free(r->A);
184 BN_clear_free(r->Ai); 184 BN_free(r->Ai);
185 BN_clear_free(r->e); 185 BN_free(r->e);
186 BN_clear_free(r->mod); 186 BN_free(r->mod);
187 free(r); 187 free(r);
188} 188}
189 189
diff --git a/src/lib/libcrypto/bn/bn_sqrt.c b/src/lib/libcrypto/bn/bn_sqrt.c
index 652dc2b5fc..9bbca4267a 100644
--- a/src/lib/libcrypto/bn/bn_sqrt.c
+++ b/src/lib/libcrypto/bn/bn_sqrt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_sqrt.c,v 1.14 2022/11/26 16:08:51 tb Exp $ */ 1/* $OpenBSD: bn_sqrt.c,v 1.15 2023/03/07 09:27:10 jsing Exp $ */
2/* Written by Lenka Fibikova <fibikova@exp-math.uni-essen.de> 2/* Written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
3 * and Bodo Moeller for the OpenSSL project. */ 3 * and Bodo Moeller for the OpenSSL project. */
4/* ==================================================================== 4/* ====================================================================
@@ -400,7 +400,7 @@ vrfy:
400end: 400end:
401 if (err) { 401 if (err) {
402 if (ret != NULL && ret != in) { 402 if (ret != NULL && ret != in) {
403 BN_clear_free(ret); 403 BN_free(ret);
404 } 404 }
405 ret = NULL; 405 ret = NULL;
406 } 406 }
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index 35a22d1ec8..e5cb46485d 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh_lib.c,v 1.37 2022/06/27 12:31:38 tb Exp $ */ 1/* $OpenBSD: dh_lib.c,v 1.38 2023/03/07 09:27:10 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -194,14 +194,14 @@ DH_free(DH *r)
194 194
195 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, r, &r->ex_data); 195 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, r, &r->ex_data);
196 196
197 BN_clear_free(r->p); 197 BN_free(r->p);
198 BN_clear_free(r->g); 198 BN_free(r->g);
199 BN_clear_free(r->q); 199 BN_free(r->q);
200 BN_clear_free(r->j); 200 BN_free(r->j);
201 free(r->seed); 201 free(r->seed);
202 BN_clear_free(r->counter); 202 BN_free(r->counter);
203 BN_clear_free(r->pub_key); 203 BN_free(r->pub_key);
204 BN_clear_free(r->priv_key); 204 BN_free(r->priv_key);
205 free(r); 205 free(r);
206} 206}
207 207
diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c
index 976b34a73a..f6c66cecde 100644
--- a/src/lib/libcrypto/dsa/dsa_asn1.c
+++ b/src/lib/libcrypto/dsa/dsa_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_asn1.c,v 1.28 2022/11/26 16:08:52 tb Exp $ */ 1/* $OpenBSD: dsa_asn1.c,v 1.29 2023/03/07 09:27:10 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -147,9 +147,9 @@ DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
147 if (r == NULL || s == NULL) 147 if (r == NULL || s == NULL)
148 return 0; 148 return 0;
149 149
150 BN_clear_free(sig->r); 150 BN_free(sig->r);
151 sig->r = r; 151 sig->r = r;
152 BN_clear_free(sig->s); 152 BN_free(sig->s);
153 sig->s = s; 153 sig->s = s;
154 154
155 return 1; 155 return 1;
diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c
index 38f0b071ec..1a6ca54da1 100644
--- a/src/lib/libcrypto/dsa/dsa_lib.c
+++ b/src/lib/libcrypto/dsa/dsa_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_lib.c,v 1.40 2023/03/04 20:54:52 tb Exp $ */ 1/* $OpenBSD: dsa_lib.c,v 1.41 2023/03/07 09:27:10 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -200,13 +200,13 @@ DSA_free(DSA *r)
200 200
201 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data); 201 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data);
202 202
203 BN_clear_free(r->p); 203 BN_free(r->p);
204 BN_clear_free(r->q); 204 BN_free(r->q);
205 BN_clear_free(r->g); 205 BN_free(r->g);
206 BN_clear_free(r->pub_key); 206 BN_free(r->pub_key);
207 BN_clear_free(r->priv_key); 207 BN_free(r->priv_key);
208 BN_clear_free(r->kinv); 208 BN_free(r->kinv);
209 BN_clear_free(r->r); 209 BN_free(r->r);
210 free(r); 210 free(r);
211} 211}
212 212
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 }
diff --git a/src/lib/libcrypto/ecdsa/ecs_asn1.c b/src/lib/libcrypto/ecdsa/ecs_asn1.c
index 9e286138e8..9db114a2d1 100644
--- a/src/lib/libcrypto/ecdsa/ecs_asn1.c
+++ b/src/lib/libcrypto/ecdsa/ecs_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecs_asn1.c,v 1.12 2022/11/26 16:08:52 tb Exp $ */ 1/* $OpenBSD: ecs_asn1.c,v 1.13 2023/03/07 09:27:10 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -141,8 +141,8 @@ ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
141 if (r == NULL || s == NULL) 141 if (r == NULL || s == NULL)
142 return 0; 142 return 0;
143 143
144 BN_clear_free(sig->r); 144 BN_free(sig->r);
145 BN_clear_free(sig->s); 145 BN_free(sig->s);
146 sig->r = r; 146 sig->r = r;
147 sig->s = s; 147 sig->s = s;
148 return 1; 148 return 1;
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c
index 5e95c5ed60..5c44c793ed 100644
--- a/src/lib/libcrypto/ecdsa/ecs_lib.c
+++ b/src/lib/libcrypto/ecdsa/ecs_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecs_lib.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */ 1/* $OpenBSD: ecs_lib.c,v 1.16 2023/03/07 09:27:10 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -221,7 +221,7 @@ ECDSA_size(const EC_KEY *r)
221 ret = 0; 221 ret = 0;
222 222
223 err: 223 err:
224 BN_clear_free(order); 224 BN_free(order);
225 225
226 return ret; 226 return ret;
227} 227}
diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c
index f169b06bd5..271c8435f8 100644
--- a/src/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecs_ossl.c,v 1.28 2023/03/04 21:39:34 tb Exp $ */ 1/* $OpenBSD: ecs_ossl.c,v 1.29 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 */
@@ -230,22 +230,22 @@ ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
230 ECDSAerror(ERR_R_BN_LIB); 230 ECDSAerror(ERR_R_BN_LIB);
231 goto err; 231 goto err;
232 } 232 }
233 BN_clear_free(*rp); 233 BN_free(*rp);
234 BN_clear_free(*kinvp); 234 BN_free(*kinvp);
235 *rp = r; 235 *rp = r;
236 *kinvp = k; 236 *kinvp = k;
237 ret = 1; 237 ret = 1;
238 238
239 err: 239 err:
240 if (ret == 0) { 240 if (ret == 0) {
241 BN_clear_free(k); 241 BN_free(k);
242 BN_clear_free(r); 242 BN_free(r);
243 } 243 }
244 if (ctx_in == NULL) 244 if (ctx_in == NULL)
245 BN_CTX_free(ctx); 245 BN_CTX_free(ctx);
246 BN_free(order); 246 BN_free(order);
247 EC_POINT_free(point); 247 EC_POINT_free(point);
248 BN_clear_free(X); 248 BN_free(X);
249 return (ret); 249 return (ret);
250} 250}
251 251
@@ -412,12 +412,12 @@ ecdsa_do_sign(const unsigned char *dgst, int dgst_len,
412 ret = NULL; 412 ret = NULL;
413 } 413 }
414 BN_CTX_free(ctx); 414 BN_CTX_free(ctx);
415 BN_clear_free(b); 415 BN_free(b);
416 BN_clear_free(binv); 416 BN_free(binv);
417 BN_clear_free(bm); 417 BN_free(bm);
418 BN_clear_free(bxr); 418 BN_free(bxr);
419 BN_clear_free(kinv); 419 BN_free(kinv);
420 BN_clear_free(m); 420 BN_free(m);
421 BN_free(order); 421 BN_free(order);
422 BN_free(range); 422 BN_free(range);
423 return ret; 423 return ret;
diff --git a/src/lib/libcrypto/gost/gostr341001_key.c b/src/lib/libcrypto/gost/gostr341001_key.c
index e44c48622c..62694318d5 100644
--- a/src/lib/libcrypto/gost/gostr341001_key.c
+++ b/src/lib/libcrypto/gost/gostr341001_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gostr341001_key.c,v 1.11 2023/01/15 13:58:44 tb Exp $ */ 1/* $OpenBSD: gostr341001_key.c,v 1.12 2023/03/07 09:27:10 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -103,7 +103,7 @@ GOST_KEY_free(GOST_KEY *r)
103 103
104 EC_GROUP_free(r->group); 104 EC_GROUP_free(r->group);
105 EC_POINT_free(r->pub_key); 105 EC_POINT_free(r->pub_key);
106 BN_clear_free(r->priv_key); 106 BN_free(r->priv_key);
107 107
108 freezero(r, sizeof(GOST_KEY)); 108 freezero(r, sizeof(GOST_KEY));
109} 109}
@@ -256,7 +256,7 @@ GOST_KEY_get0_private_key(const GOST_KEY *key)
256int 256int
257GOST_KEY_set_private_key(GOST_KEY *key, const BIGNUM *priv_key) 257GOST_KEY_set_private_key(GOST_KEY *key, const BIGNUM *priv_key)
258{ 258{
259 BN_clear_free(key->priv_key); 259 BN_free(key->priv_key);
260 key->priv_key = BN_dup(priv_key); 260 key->priv_key = BN_dup(priv_key);
261 return (key->priv_key == NULL) ? 0 : 1; 261 return (key->priv_key == NULL) ? 0 : 1;
262} 262}
@@ -310,12 +310,12 @@ GOST_KEY_get_size(const GOST_KEY *r)
310 return 0; 310 return 0;
311 311
312 if (EC_GROUP_get_order(group, order, NULL) == 0) { 312 if (EC_GROUP_get_order(group, order, NULL) == 0) {
313 BN_clear_free(order); 313 BN_free(order);
314 return 0; 314 return 0;
315 } 315 }
316 316
317 i = BN_num_bytes(order); 317 i = BN_num_bytes(order);
318 BN_clear_free(order); 318 BN_free(order);
319 return (i); 319 return (i);
320} 320}
321#endif 321#endif
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c
index 1720484952..3689c0b54d 100644
--- a/src/lib/libcrypto/rsa/rsa_lib.c
+++ b/src/lib/libcrypto/rsa/rsa_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa_lib.c,v 1.44 2022/11/26 16:08:54 tb Exp $ */ 1/* $OpenBSD: rsa_lib.c,v 1.45 2023/03/07 09:27:10 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -200,14 +200,14 @@ RSA_free(RSA *r)
200 200
201 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data); 201 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);
202 202
203 BN_clear_free(r->n); 203 BN_free(r->n);
204 BN_clear_free(r->e); 204 BN_free(r->e);
205 BN_clear_free(r->d); 205 BN_free(r->d);
206 BN_clear_free(r->p); 206 BN_free(r->p);
207 BN_clear_free(r->q); 207 BN_free(r->q);
208 BN_clear_free(r->dmp1); 208 BN_free(r->dmp1);
209 BN_clear_free(r->dmq1); 209 BN_free(r->dmq1);
210 BN_clear_free(r->iqmp); 210 BN_free(r->iqmp);
211 BN_BLINDING_free(r->blinding); 211 BN_BLINDING_free(r->blinding);
212 BN_BLINDING_free(r->mt_blinding); 212 BN_BLINDING_free(r->mt_blinding);
213 RSA_PSS_PARAMS_free(r->pss); 213 RSA_PSS_PARAMS_free(r->pss);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 05:17:16 +0000