diff options
author | jsg@openbsd.org <jsg@openbsd.org> | 2020-02-26 13:40:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-02-28 12:26:28 +1100 |
commit | d5ba1c03278eb079438bb038266d80d7477d49cb (patch) | |
tree | 6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /monitor.c | |
parent | 9e3220b585c5be19a7431ea4ff8884c137b3a81c (diff) |
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 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.208 2020/02/06 22:30:54 naddy Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.209 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -893,8 +893,7 @@ mm_answer_authpassword(struct ssh *ssh, int sock, struct sshbuf *m) | |||
893 | /* Only authenticate if the context is valid */ | 893 | /* Only authenticate if the context is valid */ |
894 | authenticated = options.password_authentication && | 894 | authenticated = options.password_authentication && |
895 | auth_password(ssh, passwd); | 895 | auth_password(ssh, passwd); |
896 | explicit_bzero(passwd, plen); | 896 | freezero(passwd, plen); |
897 | free(passwd); | ||
898 | 897 | ||
899 | sshbuf_reset(m); | 898 | sshbuf_reset(m); |
900 | if ((r = sshbuf_put_u32(m, authenticated)) != 0) | 899 | if ((r = sshbuf_put_u32(m, authenticated)) != 0) |