- tedu@cvs.openbsd.org 2014/01/31 16:39:19

     [auth2-chall.c authfd.c authfile.c bufaux.c bufec.c canohost.c]
     [channels.c cipher-chachapoly.c clientloop.c configure.ac hostfile.c]
     [kexc25519.c krl.c monitor.c sandbox-systrace.c session.c]
     [sftp-client.c ssh-keygen.c ssh.c sshconnect2.c sshd.c sshlogin.c]
     [openbsd-compat/explicit_bzero.c openbsd-compat/openbsd-compat.h]
     replace most bzero with explicit_bzero, except a few that cna be memset
     ok djm dtucker

1 files changed, 6 insertions, 6 deletions

diff --git a/ssh.c b/ssh.c
index 5de8fcf43..ec957333b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.397 2013/12/29 05:42:16 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.398 2014/01/31 16:39:19 tedu Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -239,7 +239,7 @@ resolve_host(const char *name, u_int port, int logerr, char *cname, size_t clen)
         int gaierr, loglevel = SYSLOG_LEVEL_DEBUG1;
 
         snprintf(strport, sizeof strport, "%u", port);
-        bzero(&hints, sizeof(hints));
+        memset(&hints, 0, sizeof(hints));
         hints.ai_family = options.address_family;
         hints.ai_socktype = SOCK_STREAM;
         if (cname != NULL)
@@ -1697,8 +1697,8 @@ load_public_identity_files(void)
 #endif /* PKCS11 */
 
         n_ids = 0;
-        bzero(identity_files, sizeof(identity_files));
-        bzero(identity_keys, sizeof(identity_keys));
+        memset(identity_files, 0, sizeof(identity_files));
+        memset(identity_keys, 0, sizeof(identity_keys));
 
 #ifdef ENABLE_PKCS11
         if (options.pkcs11_provider != NULL &&
@@ -1773,9 +1773,9 @@ load_public_identity_files(void)
         memcpy(options.identity_files, identity_files, sizeof(identity_files));
         memcpy(options.identity_keys, identity_keys, sizeof(identity_keys));
 
-        bzero(pwname, strlen(pwname));
+        explicit_bzero(pwname, strlen(pwname));
         free(pwname);
-        bzero(pwdir, strlen(pwdir));
+        explicit_bzero(pwdir, strlen(pwdir));
         free(pwdir);
 }