From 19dfe7f484e5739359ee8c102d879d125df916ad Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 7 Mar 2023 09:27:10 +0000
Subject: 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@
---
 src/lib/libcrypto/ec/ec2_smpl.c | 14 +++++++-------
 src/lib/libcrypto/ec/ec_key.c   |  4 ++--
 src/lib/libcrypto/ec/ec_lib.c   |  6 +++---
 src/lib/libcrypto/ec/ec_print.c |  4 ++--
 src/lib/libcrypto/ec/ecp_smpl.c | 16 ++++++++--------
 5 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/lib/libcrypto/ec')

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 @@
-/* $OpenBSD: ec2_smpl.c,v 1.30 2023/03/07 05:50:59 jsing Exp $ */
+/* $OpenBSD: ec2_smpl.c,v 1.31 2023/03/07 09:27:10 jsing Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -107,9 +107,9 @@ ec_GF2m_simple_group_finish(EC_GROUP *group)
 static void
 ec_GF2m_simple_group_clear_finish(EC_GROUP *group)
 {
-	BN_clear_free(&group->field);
-	BN_clear_free(&group->a);
-	BN_clear_free(&group->b);
+	BN_free(&group->field);
+	BN_free(&group->a);
+	BN_free(&group->b);
 	group->poly[0] = 0;
 	group->poly[1] = 0;
 	group->poly[2] = 0;
@@ -285,9 +285,9 @@ ec_GF2m_simple_point_finish(EC_POINT *point)
 static void
 ec_GF2m_simple_point_clear_finish(EC_POINT *point)
 {
-	BN_clear_free(&point->X);
-	BN_clear_free(&point->Y);
-	BN_clear_free(&point->Z);
+	BN_free(&point->X);
+	BN_free(&point->Y);
+	BN_free(&point->Z);
 	point->Z_is_one = 0;
 }
 
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 @@
-/* $OpenBSD: ec_key.c,v 1.30 2023/01/14 15:10:45 jsing Exp $ */
+/* $OpenBSD: ec_key.c,v 1.31 2023/03/07 09:27:10 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -120,7 +120,7 @@ EC_KEY_free(EC_KEY *r)
 
 	EC_GROUP_free(r->group);
 	EC_POINT_free(r->pub_key);
-	BN_clear_free(r->priv_key);
+	BN_free(r->priv_key);
 
 	EC_EX_DATA_free_all_data(&r->method_data);
 
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 @@
-/* $OpenBSD: ec_lib.c,v 1.48 2023/02/07 09:00:48 tb Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.49 2023/03/07 09:27:10 jsing Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -149,8 +149,8 @@ EC_GROUP_clear_free(EC_GROUP *group)
 	EC_EX_DATA_clear_free_all_data(&group->extra_data);
 
 	EC_POINT_clear_free(group->generator);
-	BN_clear_free(&group->order);
-	BN_clear_free(&group->cofactor);
+	BN_free(&group->order);
+	BN_free(&group->cofactor);
 
 	freezero(group->seed, group->seed_len);
 	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 @@
-/* $OpenBSD: ec_print.c,v 1.9 2022/11/26 16:08:52 tb Exp $ */
+/* $OpenBSD: ec_print.c,v 1.10 2023/03/07 09:27:10 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -172,7 +172,7 @@ EC_POINT_hex2point(const EC_GROUP *group, const char *buf,
 
 	ret = EC_POINT_bn2point(group, tmp_bn, point, ctx);
 
-	BN_clear_free(tmp_bn);
+	BN_free(tmp_bn);
 
 	return ret;
 }
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 @@
-/* $OpenBSD: ecp_smpl.c,v 1.39 2023/03/07 05:54:40 jsing Exp $ */
+/* $OpenBSD: ecp_smpl.c,v 1.40 2023/03/07 09:27:10 jsing Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project.
  * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -102,9 +102,9 @@ ec_GFp_simple_group_finish(EC_GROUP *group)
 void
 ec_GFp_simple_group_clear_finish(EC_GROUP *group)
 {
-	BN_clear_free(&group->field);
-	BN_clear_free(&group->a);
-	BN_clear_free(&group->b);
+	BN_free(&group->field);
+	BN_free(&group->a);
+	BN_free(&group->b);
 }
 
 int
@@ -324,9 +324,9 @@ ec_GFp_simple_point_finish(EC_POINT *point)
 void
 ec_GFp_simple_point_clear_finish(EC_POINT *point)
 {
-	BN_clear_free(&point->X);
-	BN_clear_free(&point->Y);
-	BN_clear_free(&point->Z);
+	BN_free(&point->X);
+	BN_free(&point->Y);
+	BN_free(&point->Z);
 	point->Z_is_one = 0;
 }
 
@@ -1324,7 +1324,7 @@ ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *po
 		 * locally!
 		 */
 		for (i = pow2 / 2 - 1; i > 0; i--) {
-			BN_clear_free(heap[i]);
+			BN_free(heap[i]);
 		}
 		free(heap);
 	}
-- 
cgit v1.2.3-55-g6feb