revert previous accidental commit

3 files changed, 33 insertions, 21 deletions

diff --git a/lib/libcrypto/rsa/rsa_eay.c b/lib/libcrypto/rsa/rsa_eay.c
index 128269a81a1..f9f620ae230 100644
--- a/lib/libcrypto/rsa/rsa_eay.c
+++ b/lib/libcrypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.47 2017/04/28 22:38:51 beck Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.48 2017/04/28 22:46:40 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -244,8 +244,10 @@ err:
 		BN_CTX_end(ctx);
 		BN_CTX_free(ctx);
 	}
-	freezero(buf, num);
-
+	if (buf != NULL) {
+		explicit_bzero(buf, num);
+		free(buf);
+	}
 	return r;
 }
 
@@ -466,8 +468,10 @@ err:
 		BN_CTX_end(ctx);
 		BN_CTX_free(ctx);
 	}
-	freezero(buf, num);
-
+	if (buf != NULL) {
+		explicit_bzero(buf, num);
+		free(buf);
+	}
 	return r;
 }
 
@@ -593,8 +597,10 @@ err:
 		BN_CTX_end(ctx);
 		BN_CTX_free(ctx);
 	}
-	freezero(buf, num);
-
+	if (buf != NULL) {
+		explicit_bzero(buf, num);
+		free(buf);
+	}
 	return r;
 }
 
@@ -694,8 +700,10 @@ err:
 		BN_CTX_end(ctx);
 		BN_CTX_free(ctx);
 	}
-	freezero(buf, num);
-
+	if (buf != NULL) {
+		explicit_bzero(buf, num);
+		free(buf);
+	}
 	return r;
 }
 
diff --git a/lib/libcrypto/rsa/rsa_saos.c b/lib/libcrypto/rsa/rsa_saos.c
index 50522b972a0..10184b6c184 100644
--- a/lib/libcrypto/rsa/rsa_saos.c
+++ b/lib/libcrypto/rsa/rsa_saos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_saos.c,v 1.21 2017/04/28 22:38:51 beck Exp $ */
+/* $OpenBSD: rsa_saos.c,v 1.22 2017/04/28 22:46:40 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -96,8 +96,8 @@ RSA_sign_ASN1_OCTET_STRING(int type, const unsigned char *m, unsigned int m_len,
 	else
 		*siglen = i;
 
-	freezero(s, (unsigned int)j + 1);
-
+	explicit_bzero(s, (unsigned int)j + 1);
+	free(s);
 	return ret;
 }
 
@@ -137,7 +137,9 @@ RSA_verify_ASN1_OCTET_STRING(int dtype, const unsigned char *m,
 		ret = 1;
 err:
 	ASN1_OCTET_STRING_free(sig);
-	freezero(s, siglen);
-
+	if (s != NULL) {
+		explicit_bzero(s, (unsigned int)siglen);
+		free(s);
+	}
 	return ret;
 }
diff --git a/lib/libcrypto/rsa/rsa_sign.c b/lib/libcrypto/rsa/rsa_sign.c
index 618ec155cc3..818b88c604b 100644
--- a/lib/libcrypto/rsa/rsa_sign.c
+++ b/lib/libcrypto/rsa/rsa_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_sign.c,v 1.27 2017/04/28 22:38:51 beck Exp $ */
+/* $OpenBSD: rsa_sign.c,v 1.28 2017/04/28 22:46:40 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -135,9 +135,10 @@ RSA_sign(int type, const unsigned char *m, unsigned int m_len,
 	else
 		*siglen = i;
 
-	if (type != NID_md5_sha1)
-		freezero(tmps, (unsigned int)j + 1);
-
+	if (type != NID_md5_sha1) {
+		explicit_bzero(tmps, (unsigned int)j + 1);
+		free(tmps);
+	}
 	return (ret);
 }
 
@@ -233,9 +234,10 @@ int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len,
 err:
 	if (sig != NULL)
 		X509_SIG_free(sig);
-
-	freezero(s, (unsigned int)siglen);
-
+	if (s != NULL) {
+		explicit_bzero(s, (unsigned int)siglen);
+		free(s);
+	}
 	return ret;
 }