upstream commit

fix hostkeys in agent; ok markus@

1 files changed, 4 insertions, 5 deletions

diff --git a/kexgexs.c b/kexgexs.c
index 6e2b009b5..d45682063 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.21 2015/01/19 20:16:15 markus Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.22 2015/01/20 07:55:33 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * 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)
                 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;
         }