summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index 2ce89fe90..b6e855d5d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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.210 2020/03/13 03:17:07 djm 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)
@@ -1723,7 +1722,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
1723 } 1722 }
1724} 1723}
1725 1724
1726/* This function requries careful sanity checking */ 1725/* This function requires careful sanity checking */
1727 1726
1728void 1727void
1729mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor) 1728mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor)