diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-01-20 07:55:33 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 18:58:36 +1100 |
commit | e2cc6bef08941256817d44d146115b3478586ad4 (patch) | |
tree | 4ee22a5f23b07e695d76ee31c959f1fde1792081 /kexecdhs.c | |
parent | 1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1 (diff) |
upstream commit
fix hostkeys in agent; ok markus@
Diffstat (limited to 'kexecdhs.c')
-rw-r--r-- | kexecdhs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kexecdhs.c b/kexecdhs.c index 6b8d95d9c..f47a7b207 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdhs.c,v 1.12 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.13 2015/01/20 07:55:33 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -95,10 +95,9 @@ input_kex_ecdh_init(int type, u_int32_t seq, void *ctxt) | |||
95 | r = SSH_ERR_INVALID_ARGUMENT; | 95 | r = SSH_ERR_INVALID_ARGUMENT; |
96 | goto out; | 96 | goto out; |
97 | } | 97 | } |
98 | if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, | 98 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); |
99 | ssh)) == NULL || | 99 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); |
100 | (server_host_private = kex->load_host_private_key(kex->hostkey_type, | 100 | if (server_host_public == NULL) { |
101 | ssh)) == NULL) { | ||
102 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 101 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
103 | goto out; | 102 | goto out; |
104 | } | 103 | } |