commit e2cc6bef08941256817d44d146115b3478586ad4
author djm@openbsd.org <djm@openbsd.org> Tue Jan 20 07:55:33 2015 +0000
committer Damien Miller <djm@mindrot.org> Tue Jan 20 18:58:36 2015 +1100
tree 4ee22a5f23b07e695d76ee31c959f1fde1792081
parent 1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1

upstream commit

fix hostkeys in agent; ok markus@

kexecdhs.c

diff --git a/kexecdhs.c b/kexecdhs.c
index 6b8d95d..f47a7b2 100644
--- a/kexecdhs.c
+++ b/kexecdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdhs.c,v 1.12 2015/01/19 20:16:15 markus Exp $ */
+/* $OpenBSD: kexecdhs.c,v 1.13 2015/01/20 07:55:33 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -95,10 +95,9 @@
 		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;
 	}