From: jsing <jsing@openbsd.org>
Date: Mon, 10 Apr 2017 17:25:22 +0000 (+0000)
Subject: Use freezero() for X25519 keys - same result with more readable code.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2b79f3ac1307e74e9797cc7f3c0e31b6e8a59eff;p=openbsd

Use freezero() for X25519 keys - same result with more readable code.
---

diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c
index 8d45e1f8c17..1fd077ec6e1 100644
--- a/lib/libssl/s3_lib.c
+++ b/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.138 2017/03/10 16:03:27 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.139 2017/04/10 17:25:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1834,9 +1834,7 @@ ssl3_free(SSL *s)
 	DH_free(S3I(s)->tmp.dh);
 	EC_KEY_free(S3I(s)->tmp.ecdh);
 
-	if (S3I(s)->tmp.x25519 != NULL)
-		explicit_bzero(S3I(s)->tmp.x25519, X25519_KEY_LENGTH);
-	free(S3I(s)->tmp.x25519);
+	freezero(S3I(s)->tmp.x25519, X25519_KEY_LENGTH);
 
 	sk_X509_NAME_pop_free(S3I(s)->tmp.ca_names, X509_NAME_free);
 
@@ -1870,9 +1868,7 @@ ssl3_clear(SSL *s)
 	EC_KEY_free(S3I(s)->tmp.ecdh);
 	S3I(s)->tmp.ecdh = NULL;
 
-	if (S3I(s)->tmp.x25519 != NULL)
-		explicit_bzero(S3I(s)->tmp.x25519, X25519_KEY_LENGTH);
-	free(S3I(s)->tmp.x25519);
+	freezero(S3I(s)->tmp.x25519, X25519_KEY_LENGTH);
 	S3I(s)->tmp.x25519 = NULL;
 
 	rp = s->s3->rbuf.buf;