New upstream release (8.3p1)

Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.

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 @@
-/* $OpenBSD: monitor.c,v 1.208 2020/02/06 22:30:54 naddy Exp $ */
+/* $OpenBSD: monitor.c,v 1.210 2020/03/13 03:17:07 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -939,8 +939,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)
@@ -1780,7 +1779,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
         }
 }
 
-/* This function requries careful sanity checking */
+/* This function requires careful sanity checking */
 
 void
 mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor)