[openssh-commits] [openssh] 01/02: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit e2cc6bef08941256817d44d146115b3478586ad4
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Jan 20 07:55:33 2015 +0000

    upstream commit
    
    fix hostkeys in agent; ok markus@
---
 kexc25519s.c | 9 ++++-----
 kexdhs.c     | 9 ++++-----
 kexecdhs.c   | 9 ++++-----
 kexgexs.c    | 9 ++++-----
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/kexc25519s.c b/kexc25519s.c
index 912b0af..d840856 100644
--- a/kexc25519s.c
+++ b/kexc25519s.c
@@ -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.
@@ -75,10 +75,9 @@ input_kex_c25519_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;
 	}
diff --git a/kexdhs.c b/kexdhs.c
index 182657a..0bfa08b 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhs.c,v 1.20 2015/01/19 20:16:15 markus Exp $ */
+/* $OpenBSD: kexdhs.c,v 1.21 2015/01/20 07:55:33 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -101,10 +101,9 @@ input_kex_dh_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;
 	}
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 @@ input_kex_ecdh_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;
 	}
diff --git a/kexgexs.c b/kexgexs.c
index 6e2b009..d456820 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;
 	}

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.