1 files changed, 6 insertions, 1 deletions

diff --git a/sshd.c b/sshd.c
index 52a3789bb..658a4978d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.377 2010/08/16 04:06:06 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.378 2010/08/31 11:54:45 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -733,6 +733,7 @@ list_hostkey_types(void)
                 switch (key->type) {
                 case KEY_RSA:
                 case KEY_DSA:
+                case KEY_ECDSA:
                         if (buffer_len(&b) > 0)
                                 buffer_append(&b, ",", 1);
                         p = key_ssh_name(key);
@@ -748,6 +749,7 @@ list_hostkey_types(void)
                 case KEY_DSA_CERT_V00:
                 case KEY_RSA_CERT:
                 case KEY_DSA_CERT:
+                case KEY_ECDSA_CERT:
                         if (buffer_len(&b) > 0)
                                 buffer_append(&b, ",", 1);
                         p = key_ssh_name(key);
@@ -774,6 +776,7 @@ get_hostkey_by_type(int type, int need_private)
                 case KEY_DSA_CERT_V00:
                 case KEY_RSA_CERT:
                 case KEY_DSA_CERT:
+                case KEY_ECDSA_CERT:
                         key = sensitive_data.host_certificates[i];
                         break;
                 default:
@@ -1576,6 +1579,7 @@ main(int ac, char **av)
                         break;
                 case KEY_RSA:
                 case KEY_DSA:
+                case KEY_ECDSA:
                         sensitive_data.have_ssh2_key = 1;
                         break;
                 }
@@ -2302,6 +2306,7 @@ do_ssh2_kex(void)
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
         kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
+        kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
         kex->server = 1;
         kex->client_version_string=client_version_string;
         kex->server_version_string=server_version_string;