Import openssh_6.6p1.orig.tar.gz

1 files changed, 5 insertions, 5 deletions

diff --git a/clientloop.c b/clientloop.c
index f30c8b6b5..59ad3a2c3 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */
+/* $OpenBSD: clientloop.c,v 1.258 2014/02/02 03:44:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -549,7 +549,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
                 gc->cb(type, seq, gc->ctx);
         if (--gc->ref_count <= 0) {
                 TAILQ_REMOVE(&global_confirms, gc, entry);
-                bzero(gc, sizeof(*gc));
+                explicit_bzero(gc, sizeof(*gc));
                 free(gc);
         }
 
@@ -876,7 +876,7 @@ process_cmdline(void)
         int cancel_port, ok;
         Forward fwd;
 
-        bzero(&fwd, sizeof(fwd));
+        memset(&fwd, 0, sizeof(fwd));
         fwd.listen_host = fwd.connect_host = NULL;
 
         leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
@@ -1761,7 +1761,7 @@ client_input_stdout_data(int type, u_int32_t seq, void *ctxt)
         char *data = packet_get_string(&data_len);
         packet_check_eom();
         buffer_append(&stdout_buffer, data, data_len);
-        memset(data, 0, data_len);
+        explicit_bzero(data, data_len);
         free(data);
 }
 static void
@@ -1771,7 +1771,7 @@ client_input_stderr_data(int type, u_int32_t seq, void *ctxt)
         char *data = packet_get_string(&data_len);
         packet_check_eom();
         buffer_append(&stderr_buffer, data, data_len);
-        memset(data, 0, data_len);
+        explicit_bzero(data, data_len);
         free(data);
 }
 static void