Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 4 insertions, 4 deletions

diff --git a/readpass.c b/readpass.c
index e37d31158..869d86425 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.49 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.50 2014/02/02 03:44:31 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -99,13 +99,13 @@ ssh_askpass(char *askpass, const char *msg)
                         break;
         signal(SIGCHLD, osigchld);
         if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-                memset(buf, 0, sizeof(buf));
+                explicit_bzero(buf, sizeof(buf));
                 return NULL;
         }
 
         buf[strcspn(buf, "\r\n")] = '\0';
         pass = xstrdup(buf);
-        memset(buf, 0, sizeof(buf));
+        explicit_bzero(buf, sizeof(buf));
         return pass;
 }
 
@@ -162,7 +162,7 @@ read_passphrase(const char *prompt, int flags)
         }
 
         ret = xstrdup(buf);
-        memset(buf, 'x', sizeof buf);
+        explicit_bzero(buf, sizeof(buf));
         return ret;
 }