diff options
| author |   djm <djm@openbsd.org> | 2020-10-07 02:22:23 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-10-07 02:22:23 +0000 |
| commit | 788a6aabc322071ece9a4c88c58b96d294a2f983 (patch) | |
| tree | 54a19ccbce78b05f1b3e90deeb4f211c362766b5 /usr.bin/ssh/sshconnect2.c | |
| parent | simply disable UpdateHostkeys when a certificate successfully (diff) | |
| download | wireguard-openbsd-788a6aabc322071ece9a4c88c58b96d294a2f983.tar.xz wireguard-openbsd-788a6aabc322071ece9a4c88c58b96d294a2f983.zip | |
revert kex->flags cert hostkey downgrade back to a plain key
(commitid VtF8vozGOF8DMKVg). We now do this a simpler way that
needs less plumbing.
ok markus@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 61c10b4fce3..7084f5b7650 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.328 2020/10/04 09:45:01 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.329 2020/10/07 02:22:23 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -92,13 +92,8 @@ struct sockaddr *xxx_hostaddr; static int verify_host_key_callback(struct sshkey *hostkey, struct ssh *ssh) { - int cert_downgraded = 0; - - if (verify_host_key(xxx_host, xxx_hostaddr, hostkey, - &cert_downgraded) == -1) + if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1) fatal("Host key verification failed."); - if (cert_downgraded) - ssh->kex->flags |= KEX_HOSTCERT_CONVERT; return 0; } |