3 files changed, 12 insertions, 11 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index 940964cac3..76863e7220 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.39 2015/06/13 08:38:10 doug Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.40 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -110,6 +110,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/opensslconf.h>
 
@@ -242,7 +243,7 @@ err:
                 BN_CTX_free(ctx);
         }
         if (buf != NULL) {
-                OPENSSL_cleanse(buf, num);
+                explicit_bzero(buf, num);
                 free(buf);
         }
         return r;
@@ -472,7 +473,7 @@ err:
                 BN_CTX_free(ctx);
         }
         if (buf != NULL) {
-                OPENSSL_cleanse(buf, num);
+                explicit_bzero(buf, num);
                 free(buf);
         }
         return r;
@@ -607,7 +608,7 @@ err:
                 BN_CTX_free(ctx);
         }
         if (buf != NULL) {
-                OPENSSL_cleanse(buf, num);
+                explicit_bzero(buf, num);
                 free(buf);
         }
         return r;
@@ -712,7 +713,7 @@ err:
                 BN_CTX_free(ctx);
         }
         if (buf != NULL) {
-                OPENSSL_cleanse(buf, num);
+                explicit_bzero(buf, num);
                 free(buf);
         }
         return r;
diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c
index 3a07a7af4a..0a4f37a3da 100644
--- a/src/lib/libcrypto/rsa/rsa_saos.c
+++ b/src/lib/libcrypto/rsa/rsa_saos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_saos.c,v 1.17 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: rsa_saos.c,v 1.18 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -97,7 +97,7 @@ RSA_sign_ASN1_OCTET_STRING(int type, const unsigned char *m, unsigned int m_len,
         else
                 *siglen = i;
 
-        OPENSSL_cleanse(s, (unsigned int)j + 1);
+        explicit_bzero(s, (unsigned int)j + 1);
         free(s);
         return ret;
 }
@@ -142,7 +142,7 @@ RSA_verify_ASN1_OCTET_STRING(int dtype, const unsigned char *m,
 err:
         M_ASN1_OCTET_STRING_free(sig);
         if (s != NULL) {
-                OPENSSL_cleanse(s, (unsigned int)siglen);
+                explicit_bzero(s, (unsigned int)siglen);
                 free(s);
         }
         return ret;
diff --git a/src/lib/libcrypto/rsa/rsa_sign.c b/src/lib/libcrypto/rsa/rsa_sign.c
index db63c5f038..7be08f544b 100644
--- a/src/lib/libcrypto/rsa/rsa_sign.c
+++ b/src/lib/libcrypto/rsa/rsa_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_sign.c,v 1.24 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: rsa_sign.c,v 1.25 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -137,7 +137,7 @@ RSA_sign(int type, const unsigned char *m, unsigned int m_len,
                 *siglen = i;
 
         if (type != NID_md5_sha1) {
-                OPENSSL_cleanse(tmps, (unsigned int)j + 1);
+                explicit_bzero(tmps, (unsigned int)j + 1);
                 free(tmps);
         }
         return (ret);
@@ -237,7 +237,7 @@ err:
         if (sig != NULL)
                 X509_SIG_free(sig);
         if (s != NULL) {
-                OPENSSL_cleanse(s, (unsigned int)siglen);
+                explicit_bzero(s, (unsigned int)siglen);
                 free(s);
         }
         return ret;