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 /kexgexs.c | |
parent | 1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1 (diff) |
upstream commit
fix hostkeys in agent; ok markus@
Diffstat (limited to 'kexgexs.c')
-rw-r--r-- | kexgexs.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexs.c,v 1.21 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexgexs.c,v 1.22 2015/01/20 07:55:33 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -160,10 +160,9 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) | |||
160 | r = SSH_ERR_INVALID_ARGUMENT; | 160 | r = SSH_ERR_INVALID_ARGUMENT; |
161 | goto out; | 161 | goto out; |
162 | } | 162 | } |
163 | if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, | 163 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); |
164 | ssh)) == NULL || | 164 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); |
165 | (server_host_private = kex->load_host_private_key(kex->hostkey_type, | 165 | if (server_host_public == NULL) { |
166 | ssh)) == NULL) { | ||
167 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 166 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
168 | goto out; | 167 | goto out; |
169 | } | 168 | } |