From f374a6c7fcebd44c8a8966ae1135bd8cb53e3702 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 10 Jul 2014 12:09:43 +0000
Subject: One sure hopes that OPENSSL_cleanse will:
/* Clear password from memory */
---
src/lib/libcrypto/pkcs12/p12_key.c | 4 ++--
src/lib/libssl/src/crypto/pkcs12/p12_key.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
index a2f7db8267..ff69b8ebc5 100644
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ b/src/lib/libcrypto/pkcs12/p12_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_key.c,v 1.17 2014/07/10 10:01:23 miod Exp $ */
+/* $OpenBSD: p12_key.c,v 1.18 2014/07/10 12:09:43 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@@ -87,7 +87,7 @@ PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
if (ret <= 0)
return 0;
if (unipass) {
- OPENSSL_cleanse(unipass, uniplen); /* Clear password from memory */
+ OPENSSL_cleanse(unipass, uniplen);
free(unipass);
}
return ret;
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_key.c b/src/lib/libssl/src/crypto/pkcs12/p12_key.c
index a2f7db8267..ff69b8ebc5 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_key.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_key.c,v 1.17 2014/07/10 10:01:23 miod Exp $ */
+/* $OpenBSD: p12_key.c,v 1.18 2014/07/10 12:09:43 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@@ -87,7 +87,7 @@ PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
if (ret <= 0)
return 0;
if (unipass) {
- OPENSSL_cleanse(unipass, uniplen); /* Clear password from memory */
+ OPENSSL_cleanse(unipass, uniplen);
free(unipass);
}
return ret;
--
cgit v1.2.3-55-g6feb