upstream: We've standardized on memset over bzero, replace a couple

that had slipped in.  ok deraadt markus djm.

OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6

diff --git a/channels.c b/channels.c
index 9683b3363dc3cb623c31558edfd4788947438ab8..95a51e21b27114838f6e2089aa48f8c1050561a7 100644 (file)
--- a/channels.c
+++ b/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
@@ -454,7 +454,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/misc.c b/misc.c
index 3a31d5c1807e05d451c1ffba0da2bc1021a1b6ef..5065072269791e40c17b85db3ffe5224033b6ddd 100644 (file)
--- a/misc.c
+++ b/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.
@@ -2255,7 +2255,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)