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, 2 insertions, 1 deletions

diff --git a/kex.c b/kex.c
index 5b7b1e86a..7eb3185e6 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.103 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: kex.c,v 1.104 2015/01/26 06:10:03 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -546,6 +546,7 @@ choose_hostkeyalg(struct kex *k, char *client, char *server)
         k->hostkey_type = sshkey_type_from_name(hostkeyalg);
         if (k->hostkey_type == KEY_UNSPEC)
                 return SSH_ERR_INTERNAL_ERROR;
+        k->hostkey_nid = sshkey_ecdsa_nid_from_name(hostkeyalg);
         free(hostkeyalg);
         return 0;
 }