From 108d362e8b071440cf3d94c13d54380c6b28902d Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Tue, 22 Jan 2002 12:10:33 +0000
Subject: [PATCH]    - markus@cvs.openbsd.org 2001/12/27 19:37:23      [dh.c
 kexdh.c kexgex.c]      always use BN_clear_free instead of BN_free

---
 ChangeLog |  3 +++
 dh.c      | 16 ++++++++--------
 kexdh.c   |  6 +++---
 kexgex.c  |  6 +++---
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35ea8def..ff4e2223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,9 @@
    - markus@cvs.openbsd.org 2001/12/27 18:26:13
      [authfile.c]
      missing include
+   - markus@cvs.openbsd.org 2001/12/27 19:37:23
+     [dh.c kexdh.c kexgex.c]
+     always use BN_clear_free instead of BN_free
 
 20020121
  - (djm) Rework ssh-rand-helper:
diff --git a/dh.c b/dh.c
index a5d6f379..3e1594ea 100644
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.18 2001/12/27 18:22:16 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.19 2001/12/27 19:37:22 markus Exp $");
 
 #include "xmalloc.h"
 
@@ -94,8 +94,8 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg)
 	return (1);
 
  failclean:
-	BN_free(dhg->g);
-	BN_free(dhg->p);
+	BN_clear_free(dhg->g);
+	BN_clear_free(dhg->p);
  fail:
 	error("Bad prime description in line %d", linenum);
 	return (0);
@@ -122,8 +122,8 @@ choose_dh(int min, int wantbits, int max)
 		linenum++;
 		if (!parse_prime(linenum, line, &dhg))
 			continue;
-		BN_free(dhg.g);
-		BN_free(dhg.p);
+		BN_clear_free(dhg.g);
+		BN_clear_free(dhg.p);
 
 		if (dhg.size > max || dhg.size < min)
 			continue;
@@ -152,8 +152,8 @@ choose_dh(int min, int wantbits, int max)
 		if ((dhg.size > max || dhg.size < min) ||
 		    dhg.size != best ||
 		    linenum++ != which) {
-			BN_free(dhg.g);
-			BN_free(dhg.p);
+			BN_clear_free(dhg.g);
+			BN_clear_free(dhg.p);
 			continue;
 		}
 		break;
@@ -203,7 +203,7 @@ dh_gen_key(DH *dh, int need)
 		    BN_num_bits(dh->p), 2*need);
 	do {
 		if (dh->priv_key != NULL)
-			BN_free(dh->priv_key);
+			BN_clear_free(dh->priv_key);
 		if ((dh->priv_key = BN_new()) == NULL)
 			fatal("dh_gen_key: BN_new failed");
 		/* generate a 2*need bits random private exponent */
diff --git a/kexdh.c b/kexdh.c
index 1e9f3583..059b41c4 100644
--- a/kexdh.c
+++ b/kexdh.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexdh.c,v 1.8 2001/12/27 18:22:16 markus Exp $");
+RCSID("$OpenBSD: kexdh.c,v 1.9 2001/12/27 19:37:22 markus Exp $");
 
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
@@ -171,7 +171,7 @@ kexdh_client(Kex *kex)
 	    shared_secret
 	);
 	xfree(server_host_key_blob);
-	BN_free(dh_server_pub);
+	BN_clear_free(dh_server_pub);
 	DH_free(dh);
 
 	if (key_verify(server_host_key, signature, slen, hash, 20) != 1)
@@ -262,7 +262,7 @@ kexdh_server(Kex *kex)
 	    dh->pub_key,
 	    shared_secret
 	);
-	BN_free(dh_client_pub);
+	BN_clear_free(dh_client_pub);
 
 	/* save session id := H */
 	/* XXX hashlen depends on KEX */
diff --git a/kexgex.c b/kexgex.c
index b4fdac69..8822c8dc 100644
--- a/kexgex.c
+++ b/kexgex.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgex.c,v 1.11 2001/12/27 18:22:16 markus Exp $");
+RCSID("$OpenBSD: kexgex.c,v 1.12 2001/12/27 19:37:23 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -232,7 +232,7 @@ kexgex_client(Kex *kex)
 	/* have keys, free DH */
 	DH_free(dh);
 	xfree(server_host_key_blob);
-	BN_free(dh_server_pub);
+	BN_clear_free(dh_server_pub);
 
 	if (key_verify(server_host_key, signature, slen, hash, 20) != 1)
 		fatal("key_verify failed for server_host_key");
@@ -365,7 +365,7 @@ kexgex_server(Kex *kex)
 	    dh->pub_key,
 	    shared_secret
 	);
-	BN_free(dh_client_pub);
+	BN_clear_free(dh_client_pub);
 
 	/* save session id := H */
 	/* XXX hashlen depends on KEX */
-- 
2.45.2