We've standardized on memset over bzero, replace a couple that had slipped

in.  ok deraadt markus djm.

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 675c876..f29b324 100644 (file)
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.397 2020/03/06 18:19:21 markus Exp $ */
+/* $OpenBSD: channels.c,v 1.398 2020/04/25 06:59:36 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -444,7 +444,7 @@ fwd_perm_clear(struct permission *perm)
        free(perm->host_to_connect);
        free(perm->listen_host);
        free(perm->listen_path);
-       bzero(perm, sizeof(*perm));
+       memset(perm, 0, sizeof(*perm));
 }
 
 /* Returns an printable name for the specified forwarding permission list */

diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index 0286d66..05ee058 100644 (file)
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.146 2020/01/28 01:49:36 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.147 2020/04/25 06:59:36 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -2167,7 +2167,7 @@ ssh_signal(int signum, sshsig_t handler)
        struct sigaction sa, osa;
 
        /* mask all other signals while in handler */
-       bzero(&sa, sizeof(sa));
+       memset(&sa, 0, sizeof(sa));
        sa.sa_handler = handler;
        sigfillset(&sa.sa_mask);
        if (signum != SIGALRM)