diff options
| author | jsg@openbsd.org <jsg@openbsd.org> | 2020-02-26 14:40:09 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-02-28 02:26:28 +0100 |
| commit | d5ba1c03278eb079438bb038266d80d7477d49cb (patch) | |
| tree | 6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /monitor.c | |
| parent | upstream: Have sftp reject "-1" in the same way as ssh(1) and (diff) | |
| download | openssh-d5ba1c03278eb079438bb038266d80d7477d49cb.tar.xz openssh-d5ba1c03278eb079438bb038266d80d7477d49cb.zip | |
upstream: change explicit_bzero();free() to freezero()
While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.
ok deraadt@ djm@
OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.208 2020/02/06 22:30:54 naddy Exp $ */ +/* $OpenBSD: monitor.c,v 1.209 2020/02/26 13:40:09 jsg Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -893,8 +893,7 @@ mm_answer_authpassword(struct ssh *ssh, int sock, struct sshbuf *m) /* Only authenticate if the context is valid */ authenticated = options.password_authentication && auth_password(ssh, passwd); - explicit_bzero(passwd, plen); - free(passwd); + freezero(passwd, plen); sshbuf_reset(m); if ((r = sshbuf_put_u32(m, authenticated)) != 0) |