6 files changed, 17 insertions, 17 deletions

diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index 3803cc3bc6..acd95abc7f 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.33 2015/07/21 03:47:17 bcook Exp $ */
+/* $OpenBSD: apps.c,v 1.34 2015/09/10 16:01:06 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -431,7 +431,7 @@ password_callback(char *buf, int bufsiz, int verify, void *arg)
                             UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
 
                 if (buff) {
-                        OPENSSL_cleanse(buff, (unsigned int) bufsiz);
+                        explicit_bzero(buff, (unsigned int) bufsiz);
                         free(buff);
                 }
                 if (ok >= 0)
@@ -439,12 +439,12 @@ password_callback(char *buf, int bufsiz, int verify, void *arg)
                 if (ok == -1) {
                         BIO_printf(bio_err, "User interface error\n");
                         ERR_print_errors(bio_err);
-                        OPENSSL_cleanse(buf, (unsigned int) bufsiz);
+                        explicit_bzero(buf, (unsigned int) bufsiz);
                         res = 0;
                 }
                 if (ok == -2) {
                         BIO_printf(bio_err, "aborted!\n");
-                        OPENSSL_cleanse(buf, (unsigned int) bufsiz);
+                        explicit_bzero(buf, (unsigned int) bufsiz);
                         res = 0;
                 }
                 UI_free(ui);
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c
index 3829715272..8645128e42 100644
--- a/src/usr.bin/openssl/ca.c
+++ b/src/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.10 2015/09/10 02:17:17 lteo Exp $ */
+/* $OpenBSD: ca.c,v 1.11 2015/09/10 16:01:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -641,7 +641,7 @@ bad:
         }
         pkey = load_key(bio_err, keyfile, keyform, 0, key, e, "CA private key");
         if (key)
-                OPENSSL_cleanse(key, strlen(key));
+                explicit_bzero(key, strlen(key));
         if (pkey == NULL) {
                 /* load_key() has already printed an appropriate message */
                 goto err;
diff --git a/src/usr.bin/openssl/dgst.c b/src/usr.bin/openssl/dgst.c
index efffd2c034..d442bba266 100644
--- a/src/usr.bin/openssl/dgst.c
+++ b/src/usr.bin/openssl/dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dgst.c,v 1.4 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: dgst.c,v 1.5 2015/09/10 16:01:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -457,7 +457,7 @@ mac_end:
 
 end:
         if (buf != NULL) {
-                OPENSSL_cleanse(buf, BUFSIZE);
+                explicit_bzero(buf, BUFSIZE);
                 free(buf);
         }
         if (in != NULL)
diff --git a/src/usr.bin/openssl/enc.c b/src/usr.bin/openssl/enc.c
index bb908b242d..3ba774053d 100644
--- a/src/usr.bin/openssl/enc.c
+++ b/src/usr.bin/openssl/enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enc.c,v 1.5 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: enc.c,v 1.6 2015/09/10 16:01:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -623,9 +623,9 @@ enc_main(int argc, char **argv)
                          * Jr. <hughes@indiana.edu>
                          */
                         if (enc_config.keystr == strbuf)
-                                OPENSSL_cleanse(enc_config.keystr, SIZE);
+                                explicit_bzero(enc_config.keystr, SIZE);
                         else
-                                OPENSSL_cleanse(enc_config.keystr,
+                                explicit_bzero(enc_config.keystr,
                                     strlen(enc_config.keystr));
                 }
                 if (enc_config.hiv != NULL &&
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index 14ba563409..f118672abb 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.17 2015/09/10 06:36:45 bcook Exp $ */
+/* $OpenBSD: s_client.c,v 1.18 2015/09/10 16:01:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1296,15 +1296,15 @@ end:
         if (vpm)
                 X509_VERIFY_PARAM_free(vpm);
         if (cbuf != NULL) {
-                OPENSSL_cleanse(cbuf, BUFSIZZ);
+                explicit_bzero(cbuf, BUFSIZZ);
                 free(cbuf);
         }
         if (sbuf != NULL) {
-                OPENSSL_cleanse(sbuf, BUFSIZZ);
+                explicit_bzero(sbuf, BUFSIZZ);
                 free(sbuf);
         }
         if (mbuf != NULL) {
-                OPENSSL_cleanse(mbuf, BUFSIZZ);
+                explicit_bzero(mbuf, BUFSIZZ);
                 free(mbuf);
         }
         if (bio_c_out != NULL) {
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 2ac8c06c1e..0272abe43b 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.15 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.16 2015/09/10 16:01:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1608,7 +1608,7 @@ err:
         }
         BIO_printf(bio_s_out, "CONNECTION CLOSED\n");
         if (buf != NULL) {
-                OPENSSL_cleanse(buf, bufsize);
+                explicit_bzero(buf, bufsize);
                 free(buf);
         }
         if (ret >= 0)