upstream commit

correctly match ECDSA subtype (== curve) for
 offered/recevied host keys. Fixes connection-killing host key mismatches when
 a server offers multiple ECDSA keys with different curve type (an extremely
 unlikely configuration).

ok markus, "looks mechanical" deraadt@

1 files changed, 5 insertions, 3 deletions

diff --git a/kexgexs.c b/kexgexs.c
index ca5ee13e9..9c281d288 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.23 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.24 2015/01/26 06:10:03 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -160,8 +160,10 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt)
                 r = SSH_ERR_INVALID_ARGUMENT;
                 goto out;
         }
-        server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh);
-        server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh);
+        server_host_public = kex->load_host_public_key(kex->hostkey_type,
+            kex->hostkey_nid, ssh);
+        server_host_private = kex->load_host_private_key(kex->hostkey_type,
+            kex->hostkey_nid, ssh);
         if (server_host_public == NULL) {
                 r = SSH_ERR_NO_HOSTKEY_LOADED;
                 goto out;