From: tb <tb@openbsd.org>
Date: Fri, 28 Jul 2023 09:29:24 +0000 (+0000)
Subject: Rename buflen to buf_len, use calloc/freezero
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=715babc0464b8b7df2b600602b7c7845048dbcb5;p=openbsd

Rename buflen to buf_len, use calloc/freezero

Some cosmetic tweaks in ecdh_compute_key(). Rename buflen to buf_len
to match out_len, use calloc() and freezero().

ok jsing
---

diff --git a/lib/libcrypto/ecdh/ecdh.c b/lib/libcrypto/ecdh/ecdh.c
index 034bd84a49a..5731f0ca3a3 100644
--- a/lib/libcrypto/ecdh/ecdh.c
+++ b/lib/libcrypto/ecdh/ecdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdh.c,v 1.7 2023/07/28 09:28:37 tb Exp $ */
+/* $OpenBSD: ecdh.c,v 1.8 2023/07/28 09:29:24 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -155,7 +155,7 @@ ecdh_compute_key(unsigned char **out, size_t *out_len, const EC_POINT *pub_key,
 	const EC_GROUP *group;
 	EC_POINT *point = NULL;
 	unsigned char *buf = NULL;
-	int buflen;
+	int buf_len = 0;
 	int ret = 0;
 
 	*out = NULL;
@@ -195,22 +195,23 @@ ecdh_compute_key(unsigned char **out, size_t *out_len, const EC_POINT *pub_key,
 		goto err;
 	}
 
-	if ((buflen = ECDH_size(ecdh)) < BN_num_bytes(x)) {
+	if ((buf_len = ECDH_size(ecdh)) < BN_num_bytes(x)) {
 		ECerror(ERR_R_INTERNAL_ERROR);
 		goto err;
 	}
-	if ((buf = malloc(buflen)) == NULL) {
+	if ((buf = calloc(1, buf_len)) == NULL) {
 		ECerror(ERR_R_MALLOC_FAILURE);
 		goto err;
 	}
-	if (BN_bn2binpad(x, buf, buflen) != buflen) {
+	if (BN_bn2binpad(x, buf, buf_len) != buf_len) {
 		ECerror(ERR_R_BN_LIB);
 		goto err;
 	}
 
 	*out = buf;
-	*out_len = buflen;
+	*out_len = buf_len;
 	buf = NULL;
+	buf_len = 0;
 
 	ret = 1;
 
@@ -218,7 +219,7 @@ ecdh_compute_key(unsigned char **out, size_t *out_len, const EC_POINT *pub_key,
 	EC_POINT_free(point);
 	BN_CTX_end(ctx);
 	BN_CTX_free(ctx);
-	free(buf);
+	freezero(buf, buf_len);
 
 	return ret;
 }