===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/kexc25519s.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/usr.bin/ssh/Attic/kexc25519s.c	2015/01/19 20:16:15	1.6
+++ src/usr.bin/ssh/Attic/kexc25519s.c	2015/01/20 07:55:33	1.7
@@ -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 @@
 		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;
 	}