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 947fdfadc..8002aca86 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>
@@ -939,8 +939,7 @@ mm_answer_authpassword(struct ssh *ssh, int sock, struct sshbuf *m)
939 /* Only authenticate if the context is valid */ 939 /* Only authenticate if the context is valid */
940 authenticated = options.password_authentication && 940 authenticated = options.password_authentication &&
941 auth_password(ssh, passwd); 941 auth_password(ssh, passwd);
942 explicit_bzero(passwd, plen); 942 freezero(passwd, plen);
943 free(passwd);
944 943
945 sshbuf_reset(m); 944 sshbuf_reset(m);
946 if ((r = sshbuf_put_u32(m, authenticated)) != 0) 945 if ((r = sshbuf_put_u32(m, authenticated)) != 0)
@@ -1780,7 +1779,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
1780 } 1779 }
1781} 1780}
1782 1781
1783/* This function requries careful sanity checking */ 1782/* This function requires careful sanity checking */
1784 1783
1785void 1784void
1786mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor) 1785mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor)