diff options
| author |   djm <djm@openbsd.org> | 2015-01-20 07:55:33 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-01-20 07:55:33 +0000 |
| commit | c7c8eb8e09796cc30d543eeab57a1da335a79ea3 (patch) | |
| tree | a32d08f9a9643e0b21c57dd8fbf3577bb8a89811 /usr.bin/ssh/kexc25519s.c | |
| parent | Change the machdep.lidsupsend example now that the default setting has been (diff) | |
| download | wireguard-openbsd-c7c8eb8e09796cc30d543eeab57a1da335a79ea3.tar.xz wireguard-openbsd-c7c8eb8e09796cc30d543eeab57a1da335a79ea3.zip | |
fix hostkeys in agent; ok markus@
Diffstat (limited to 'usr.bin/ssh/kexc25519s.c')
| -rw-r--r-- | usr.bin/ssh/kexc25519s.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/ssh/kexc25519s.c b/usr.bin/ssh/kexc25519s.c index 7dd5bb82675..867b6e75516 100644 --- a/usr.bin/ssh/kexc25519s.c +++ b/usr.bin/ssh/kexc25519s.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexc25519s.c,v 1.6 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: kexc25519s.c,v 1.7 2015/01/20 07:55:33 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -73,10 +73,9 @@ input_kex_c25519_init(int type, u_int32_t seq, void *ctxt) r = SSH_ERR_INVALID_ARGUMENT; goto out; } - if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, - ssh)) == NULL || - (server_host_private = kex->load_host_private_key(kex->hostkey_type, - ssh)) == NULL) { + server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); + server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); + if (server_host_public == NULL) { r = SSH_ERR_NO_HOSTKEY_LOADED; goto out; } |