diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /monitor.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 7 |
1 files changed, 3 insertions, 4 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.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 | ||
1785 | void | 1784 | void |
1786 | mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor) | 1785 | mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor) |