merge 5.7p1

1 files changed, 645 insertions, 28 deletions

diff --git a/key.c b/key.c
index 020f503b6..6ccfd8dcb 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.90 2010/07/13 23:13:16 djm Exp $ */
+/* $OpenBSD: key.c,v 1.95 2010/11/10 01:33:07 djm Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -78,6 +78,8 @@ key_new(int type)
         DSA *dsa;
         k = xcalloc(1, sizeof(*k));
         k->type = type;
+        k->ecdsa = NULL;
+        k->ecdsa_nid = -1;
         k->dsa = NULL;
         k->rsa = NULL;
         k->cert = NULL;
@@ -109,6 +111,12 @@ key_new(int type)
                         fatal("key_new: BN_new failed");
                 k->dsa = dsa;
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+        case KEY_ECDSA_CERT:
+                /* Cannot do anything until we know the group */
+                break;
+#endif
         case KEY_UNSPEC:
                 break;
         default:
@@ -149,6 +157,10 @@ key_add_private(Key *k)
                 if ((k->dsa->priv_key = BN_new()) == NULL)
                         fatal("key_new_private: BN_new failed");
                 break;
+        case KEY_ECDSA:
+        case KEY_ECDSA_CERT:
+                /* Cannot do anything until we know the group */
+                break;
         case KEY_UNSPEC:
                 break;
         default:
@@ -204,6 +216,14 @@ key_free(Key *k)
                         DSA_free(k->dsa);
                 k->dsa = NULL;
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+        case KEY_ECDSA_CERT:
+                if (k->ecdsa != NULL)
+                        EC_KEY_free(k->ecdsa);
+                k->ecdsa = NULL;
+                break;
+#endif
         case KEY_UNSPEC:
                 break;
         default:
@@ -241,6 +261,10 @@ cert_compare(struct KeyCert *a, struct KeyCert *b)
 int
 key_equal_public(const Key *a, const Key *b)
 {
+#ifdef OPENSSL_HAS_ECC
+        BN_CTX *bnctx;
+#endif
+
         if (a == NULL || b == NULL ||
             key_type_plain(a->type) != key_type_plain(b->type))
                 return 0;
@@ -261,6 +285,26 @@ key_equal_public(const Key *a, const Key *b)
                     BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
                     BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
                     BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+        case KEY_ECDSA:
+                if (a->ecdsa == NULL || b->ecdsa == NULL ||
+                    EC_KEY_get0_public_key(a->ecdsa) == NULL ||
+                    EC_KEY_get0_public_key(b->ecdsa) == NULL)
+                        return 0;
+                if ((bnctx = BN_CTX_new()) == NULL)
+                        fatal("%s: BN_CTX_new failed", __func__);
+                if (EC_GROUP_cmp(EC_KEY_get0_group(a->ecdsa),
+                    EC_KEY_get0_group(b->ecdsa), bnctx) != 0 ||
+                    EC_POINT_cmp(EC_KEY_get0_group(a->ecdsa),
+                    EC_KEY_get0_public_key(a->ecdsa),
+                    EC_KEY_get0_public_key(b->ecdsa), bnctx) != 0) {
+                        BN_CTX_free(bnctx);
+                        return 0;
+                }
+                BN_CTX_free(bnctx);
+                return 1;
+#endif /* OPENSSL_HAS_ECC */
         default:
                 fatal("key_equal: bad key type %d", a->type);
         }
@@ -312,12 +356,14 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length)
                 BN_bn2bin(k->rsa->e, blob + nlen);
                 break;
         case KEY_DSA:
+        case KEY_ECDSA:
         case KEY_RSA:
                 key_to_blob(k, &blob, &len);
                 break;
         case KEY_DSA_CERT_V00:
         case KEY_RSA_CERT_V00:
         case KEY_DSA_CERT:
+        case KEY_ECDSA_CERT:
         case KEY_RSA_CERT:
                 /* We want a fingerprint of the _key_ not of the cert */
                 otype = k->type;
@@ -615,6 +661,9 @@ key_read(Key *ret, char **cpp)
         int len, n, type;
         u_int bits;
         u_char *blob;
+#ifdef OPENSSL_HAS_ECC
+        int curve_nid = -1;
+#endif
 
         cp = *cpp;
 
@@ -644,9 +693,11 @@ key_read(Key *ret, char **cpp)
         case KEY_UNSPEC:
         case KEY_RSA:
         case KEY_DSA:
+        case KEY_ECDSA:
         case KEY_DSA_CERT_V00:
         case KEY_RSA_CERT_V00:
         case KEY_DSA_CERT:
+        case KEY_ECDSA_CERT:
         case KEY_RSA_CERT:
                 space = strchr(cp, ' ');
                 if (space == NULL) {
@@ -655,6 +706,13 @@ key_read(Key *ret, char **cpp)
                 }
                 *space = '\0';
                 type = key_type_from_name(cp);
+#ifdef OPENSSL_HAS_ECC
+                if (key_type_plain(type) == KEY_ECDSA &&
+                    (curve_nid = key_ecdsa_nid_from_name(cp)) == -1) {
+                        debug("key_read: invalid curve");
+                        return -1;
+                }
+#endif
                 *space = ' ';
                 if (type == KEY_UNSPEC) {
                         debug3("key_read: missing keytype");
@@ -691,6 +749,14 @@ key_read(Key *ret, char **cpp)
                         key_free(k);
                         return -1;
                 }
+#ifdef OPENSSL_HAS_ECC
+                if (key_type_plain(type) == KEY_ECDSA &&
+                    curve_nid != k->ecdsa_nid) {
+                        error("key_read: type mismatch: EC curve mismatch");
+                        key_free(k);
+                        return -1;
+                }
+#endif
 /*XXXX*/
                 if (key_is_cert(ret)) {
                         if (!key_is_cert(k)) {
@@ -721,6 +787,19 @@ key_read(Key *ret, char **cpp)
                         DSA_print_fp(stderr, ret->dsa, 8);
 #endif
                 }
+#ifdef OPENSSL_HAS_ECC
+                if (key_type_plain(ret->type) == KEY_ECDSA) {
+                        if (ret->ecdsa != NULL)
+                                EC_KEY_free(ret->ecdsa);
+                        ret->ecdsa = k->ecdsa;
+                        ret->ecdsa_nid = k->ecdsa_nid;
+                        k->ecdsa = NULL;
+                        k->ecdsa_nid = -1;
+#ifdef DEBUG_PK
+                        key_dump_ec_key(ret->ecdsa);
+#endif
+                }
+#endif
                 success = 1;
 /*XXXX*/
                 key_free(k);
@@ -777,6 +856,13 @@ key_write(const Key *key, FILE *f)
                 if (key->dsa == NULL)
                         return 0;
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+        case KEY_ECDSA_CERT:
+                if (key->ecdsa == NULL)
+                        return 0;
+                break;
+#endif
         case KEY_RSA:
         case KEY_RSA_CERT_V00:
         case KEY_RSA_CERT:
@@ -810,6 +896,10 @@ key_type(const Key *k)
                 return "RSA";
         case KEY_DSA:
                 return "DSA";
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+                return "ECDSA";
+#endif
         case KEY_RSA_CERT_V00:
                 return "RSA-CERT-V00";
         case KEY_DSA_CERT_V00:
@@ -818,6 +908,10 @@ key_type(const Key *k)
                 return "RSA-CERT";
         case KEY_DSA_CERT:
                 return "DSA-CERT";
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+                return "ECDSA-CERT";
+#endif
         }
         return "unknown";
 }
@@ -835,10 +929,10 @@ key_cert_type(const Key *k)
         }
 }
 
-const char *
-key_ssh_name(const Key *k)
+static const char *
+key_ssh_name_from_type_nid(int type, int nid)
 {
-        switch (k->type) {
+        switch (type) {
         case KEY_RSA:
                 return "ssh-rsa";
         case KEY_DSA:
@@ -851,12 +945,51 @@ key_ssh_name(const Key *k)
                 return "ssh-rsa-cert-v01@openssh.com";
         case KEY_DSA_CERT:
                 return "ssh-dss-cert-v01@openssh.com";
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+                switch (nid) {
+                case NID_X9_62_prime256v1:
+                        return "ecdsa-sha2-nistp256";
+                case NID_secp384r1:
+                        return "ecdsa-sha2-nistp384";
+                case NID_secp521r1:
+                        return "ecdsa-sha2-nistp521";
+                default:
+                        break;
+                }
+                break;
+        case KEY_ECDSA_CERT:
+                switch (nid) {
+                case NID_X9_62_prime256v1:
+                        return "ecdsa-sha2-nistp256-cert-v01@openssh.com";
+                case NID_secp384r1:
+                        return "ecdsa-sha2-nistp384-cert-v01@openssh.com";
+                case NID_secp521r1:
+                        return "ecdsa-sha2-nistp521-cert-v01@openssh.com";
+                default:
+                        break;
+                }
+                break;
+#endif /* OPENSSL_HAS_ECC */
         case KEY_NULL:
                 return "null";
         }
         return "ssh-unknown";
 }
 
+const char *
+key_ssh_name(const Key *k)
+{
+        return key_ssh_name_from_type_nid(k->type, k->ecdsa_nid);
+}
+
+const char *
+key_ssh_name_plain(const Key *k)
+{
+        return key_ssh_name_from_type_nid(key_type_plain(k->type),
+            k->ecdsa_nid);
+}
+
 u_int
 key_size(const Key *k)
 {
@@ -870,6 +1003,11 @@ key_size(const Key *k)
         case KEY_DSA_CERT_V00:
         case KEY_DSA_CERT:
                 return BN_num_bits(k->dsa->p);
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+        case KEY_ECDSA_CERT:
+                return key_curve_nid_to_bits(k->ecdsa_nid);
+#endif
         }
         return 0;
 }
@@ -877,27 +1015,115 @@ key_size(const Key *k)
 static RSA *
 rsa_generate_private_key(u_int bits)
 {
-        RSA *private;
+        RSA *private = RSA_new();
+        BIGNUM *f4 = BN_new();
 
-        private = RSA_generate_key(bits, RSA_F4, NULL, NULL);
         if (private == NULL)
-                fatal("rsa_generate_private_key: key generation failed.");
+                fatal("%s: RSA_new failed", __func__);
+        if (f4 == NULL)
+                fatal("%s: BN_new failed", __func__);
+        if (!BN_set_word(f4, RSA_F4))
+                fatal("%s: BN_new failed", __func__);
+        if (!RSA_generate_key_ex(private, bits, f4, NULL))
+                fatal("%s: key generation failed.", __func__);
+        BN_free(f4);
         return private;
 }
 
 static DSA*
 dsa_generate_private_key(u_int bits)
 {
-        DSA *private = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL);
+        DSA *private = DSA_new();
 
         if (private == NULL)
-                fatal("dsa_generate_private_key: DSA_generate_parameters failed");
+                fatal("%s: DSA_new failed", __func__);
+        if (!DSA_generate_parameters_ex(private, bits, NULL, 0, NULL,
+            NULL, NULL))
+                fatal("%s: DSA_generate_parameters failed", __func__);
         if (!DSA_generate_key(private))
-                fatal("dsa_generate_private_key: DSA_generate_key failed.");
-        if (private == NULL)
-                fatal("dsa_generate_private_key: NULL.");
+                fatal("%s: DSA_generate_key failed.", __func__);
+        return private;
+}
+
+int
+key_ecdsa_bits_to_nid(int bits)
+{
+        switch (bits) {
+#ifdef OPENSSL_HAS_ECC
+        case 256:
+                return NID_X9_62_prime256v1;
+        case 384:
+                return NID_secp384r1;
+        case 521:
+                return NID_secp521r1;
+#endif
+        default:
+                return -1;
+        }
+}
+
+#ifdef OPENSSL_HAS_ECC
+int
+key_ecdsa_key_to_nid(EC_KEY *k)
+{
+        EC_GROUP *eg;
+        int nids[] = {
+                NID_X9_62_prime256v1,
+                NID_secp384r1,
+                NID_secp521r1,
+                -1
+        };
+        int nid;
+        u_int i;
+        BN_CTX *bnctx;
+        const EC_GROUP *g = EC_KEY_get0_group(k);
+
+        /*
+         * The group may be stored in a ASN.1 encoded private key in one of two
+         * ways: as a "named group", which is reconstituted by ASN.1 object ID
+         * or explicit group parameters encoded into the key blob. Only the
+         * "named group" case sets the group NID for us, but we can figure
+         * it out for the other case by comparing against all the groups that
+         * are supported.
+         */
+        if ((nid = EC_GROUP_get_curve_name(g)) > 0)
+                return nid;
+        if ((bnctx = BN_CTX_new()) == NULL)
+                fatal("%s: BN_CTX_new() failed", __func__);
+        for (i = 0; nids[i] != -1; i++) {
+                if ((eg = EC_GROUP_new_by_curve_name(nids[i])) == NULL)
+                        fatal("%s: EC_GROUP_new_by_curve_name failed",
+                            __func__);
+                if (EC_GROUP_cmp(g, eg, bnctx) == 0)
+                        break;
+                EC_GROUP_free(eg);
+        }
+        BN_CTX_free(bnctx);
+        debug3("%s: nid = %d", __func__, nids[i]);
+        if (nids[i] != -1) {
+                /* Use the group with the NID attached */
+                EC_GROUP_set_asn1_flag(eg, OPENSSL_EC_NAMED_CURVE);
+                if (EC_KEY_set_group(k, eg) != 1)
+                        fatal("%s: EC_KEY_set_group", __func__);
+        }
+        return nids[i];
+}
+
+static EC_KEY*
+ecdsa_generate_private_key(u_int bits, int *nid)
+{
+        EC_KEY *private;
+
+        if ((*nid = key_ecdsa_bits_to_nid(bits)) == -1)
+                fatal("%s: invalid key length", __func__);
+        if ((private = EC_KEY_new_by_curve_name(*nid)) == NULL)
+                fatal("%s: EC_KEY_new_by_curve_name failed", __func__);
+        if (EC_KEY_generate_key(private) != 1)
+                fatal("%s: EC_KEY_generate_key failed", __func__);
+        EC_KEY_set_asn1_flag(private, OPENSSL_EC_NAMED_CURVE);
         return private;
 }
+#endif /* OPENSSL_HAS_ECC */
 
 Key *
 key_generate(int type, u_int bits)
@@ -907,6 +1133,11 @@ key_generate(int type, u_int bits)
         case KEY_DSA:
                 k->dsa = dsa_generate_private_key(bits);
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+                k->ecdsa = ecdsa_generate_private_key(bits, &k->ecdsa_nid);
+                break;
+#endif
         case KEY_RSA:
         case KEY_RSA1:
                 k->rsa = rsa_generate_private_key(bits);
@@ -983,6 +1214,18 @@ key_from_private(const Key *k)
                     (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
                         fatal("key_from_private: BN_copy failed");
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+        case KEY_ECDSA_CERT:
+                n = key_new(k->type);
+                n->ecdsa_nid = k->ecdsa_nid;
+                if ((n->ecdsa = EC_KEY_new_by_curve_name(k->ecdsa_nid)) == NULL)
+                        fatal("%s: EC_KEY_new_by_curve_name failed", __func__);
+                if (EC_KEY_set_public_key(n->ecdsa,
+                    EC_KEY_get0_public_key(k->ecdsa)) != 1)
+                        fatal("%s: EC_KEY_set_public_key failed", __func__);
+                break;
+#endif
         case KEY_RSA:
         case KEY_RSA1:
         case KEY_RSA_CERT_V00:
@@ -1014,6 +1257,13 @@ key_type_from_name(char *name)
                 return KEY_RSA;
         } else if (strcmp(name, "ssh-dss") == 0) {
                 return KEY_DSA;
+#ifdef OPENSSL_HAS_ECC
+        } else if (strcmp(name, "ecdsa") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp256") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp384") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp521") == 0) {
+                return KEY_ECDSA;
+#endif
         } else if (strcmp(name, "ssh-rsa-cert-v00@openssh.com") == 0) {
                 return KEY_RSA_CERT_V00;
         } else if (strcmp(name, "ssh-dss-cert-v00@openssh.com") == 0) {
@@ -1022,14 +1272,40 @@ key_type_from_name(char *name)
                 return KEY_RSA_CERT;
         } else if (strcmp(name, "ssh-dss-cert-v01@openssh.com") == 0) {
                 return KEY_DSA_CERT;
+#ifdef OPENSSL_HAS_ECC
+        } else if (strcmp(name, "ecdsa-sha2-nistp256-cert-v01@openssh.com") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp384-cert-v01@openssh.com") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp521-cert-v01@openssh.com") == 0) {
+                return KEY_ECDSA_CERT;
+#endif
         } else if (strcmp(name, "null") == 0) {
                 return KEY_NULL;
         }
+
         debug2("key_type_from_name: unknown key type '%s'", name);
         return KEY_UNSPEC;
 }
 
 int
+key_ecdsa_nid_from_name(const char *name)
+{
+#ifdef OPENSSL_HAS_ECC
+        if (strcmp(name, "ecdsa-sha2-nistp256") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp256-cert-v01@openssh.com") == 0)
+                return NID_X9_62_prime256v1;
+        if (strcmp(name, "ecdsa-sha2-nistp384") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp384-cert-v01@openssh.com") == 0)
+                return NID_secp384r1;
+        if (strcmp(name, "ecdsa-sha2-nistp521") == 0 ||
+            strcmp(name, "ecdsa-sha2-nistp521-cert-v01@openssh.com") == 0)
+                return NID_secp521r1;
+#endif /* OPENSSL_HAS_ECC */
+
+        debug2("%s: unknown/non-ECDSA key type '%s'", __func__, name);
+        return -1;
+}
+
+int
 key_names_valid2(const char *names)
 {
         char *s, *cp, *p;
@@ -1071,7 +1347,7 @@ cert_parse(Buffer *b, Key *key, const u_char *blob, u_int blen)
         principals = exts = critical = sig_key = sig = NULL;
         if ((!v00 && buffer_get_int64_ret(&key->cert->serial, b) != 0) ||
             buffer_get_int_ret(&key->cert->type, b) != 0 ||
-            (key->cert->key_id = buffer_get_string_ret(b, &kidlen)) == NULL ||
+            (key->cert->key_id = buffer_get_cstring_ret(b, &kidlen)) == NULL ||
             (principals = buffer_get_string_ret(b, &plen)) == NULL ||
             buffer_get_int64_ret(&key->cert->valid_after, b) != 0 ||
             buffer_get_int64_ret(&key->cert->valid_before, b) != 0 ||
@@ -1109,15 +1385,10 @@ cert_parse(Buffer *b, Key *key, const u_char *blob, u_int blen)
                         error("%s: Too many principals", __func__);
                         goto out;
                 }
-                if ((principal = buffer_get_string_ret(&tmp, &plen)) == NULL) {
+                if ((principal = buffer_get_cstring_ret(&tmp, &plen)) == NULL) {
                         error("%s: Principals data invalid", __func__);
                         goto out;
                 }
-                if (strlen(principal) != plen) {
-                        error("%s: Principal contains \\0 character",
-                            __func__);
-                        goto out;
-                }
                 key->cert->principals = xrealloc(key->cert->principals,
                     key->cert->nprincipals + 1, sizeof(*key->cert->principals));
                 key->cert->principals[key->cert->nprincipals++] = principal;
@@ -1155,7 +1426,8 @@ cert_parse(Buffer *b, Key *key, const u_char *blob, u_int blen)
                 goto out;
         }
         if (key->cert->signature_key->type != KEY_RSA &&
-            key->cert->signature_key->type != KEY_DSA) {
+            key->cert->signature_key->type != KEY_DSA &&
+            key->cert->signature_key->type != KEY_ECDSA) {
                 error("%s: Invalid signature key type %s (%d)", __func__,
                     key_type(key->cert->signature_key),
                     key->cert->signature_key->type);
@@ -1196,20 +1468,28 @@ key_from_blob(const u_char *blob, u_int blen)
 {
         Buffer b;
         int rlen, type;
-        char *ktype = NULL;
+        char *ktype = NULL, *curve = NULL;
         Key *key = NULL;
+#ifdef OPENSSL_HAS_ECC
+        EC_POINT *q = NULL;
+        int nid = -1;
+#endif
 
 #ifdef DEBUG_PK
         dump_base64(stderr, blob, blen);
 #endif
         buffer_init(&b);
         buffer_append(&b, blob, blen);
-        if ((ktype = buffer_get_string_ret(&b, NULL)) == NULL) {
+        if ((ktype = buffer_get_cstring_ret(&b, NULL)) == NULL) {
                 error("key_from_blob: can't read key type");
                 goto out;
         }
 
         type = key_type_from_name(ktype);
+#ifdef OPENSSL_HAS_ECC
+        if (key_type_plain(type) == KEY_ECDSA)
+                nid = key_ecdsa_nid_from_name(ktype);
+#endif
 
         switch (type) {
         case KEY_RSA_CERT:
@@ -1247,6 +1527,43 @@ key_from_blob(const u_char *blob, u_int blen)
                 DSA_print_fp(stderr, key->dsa, 8);
 #endif
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+                (void)buffer_get_string_ptr_ret(&b, NULL); /* Skip nonce */
+                /* FALLTHROUGH */
+        case KEY_ECDSA:
+                key = key_new(type);
+                key->ecdsa_nid = nid;
+                if ((curve = buffer_get_string_ret(&b, NULL)) == NULL) {
+                        error("key_from_blob: can't read ecdsa curve");
+                        goto badkey;
+                }
+                if (key->ecdsa_nid != key_curve_name_to_nid(curve)) {
+                        error("key_from_blob: ecdsa curve doesn't match type");
+                        goto badkey;
+                }
+                if (key->ecdsa != NULL)
+                        EC_KEY_free(key->ecdsa);
+                if ((key->ecdsa = EC_KEY_new_by_curve_name(key->ecdsa_nid))
+                    == NULL)
+                        fatal("key_from_blob: EC_KEY_new_by_curve_name failed");
+                if ((q = EC_POINT_new(EC_KEY_get0_group(key->ecdsa))) == NULL)
+                        fatal("key_from_blob: EC_POINT_new failed");
+                if (buffer_get_ecpoint_ret(&b, EC_KEY_get0_group(key->ecdsa),
+                    q) == -1) {
+                        error("key_from_blob: can't read ecdsa key point");
+                        goto badkey;
+                }
+                if (key_ec_validate_public(EC_KEY_get0_group(key->ecdsa),
+                    q) != 0)
+                        goto badkey;
+                if (EC_KEY_set_public_key(key->ecdsa, q) != 1)
+                        fatal("key_from_blob: EC_KEY_set_public_key failed");
+#ifdef DEBUG_PK
+                key_dump_ec_point(EC_KEY_get0_group(key->ecdsa), q);
+#endif
+                break;
+#endif /* OPENSSL_HAS_ECC */
         case KEY_UNSPEC:
                 key = key_new(type);
                 break;
@@ -1264,6 +1581,12 @@ key_from_blob(const u_char *blob, u_int blen)
  out:
         if (ktype != NULL)
                 xfree(ktype);
+        if (curve != NULL)
+                xfree(curve);
+#ifdef OPENSSL_HAS_ECC
+        if (q != NULL)
+                EC_POINT_free(q);
+#endif
         buffer_free(&b);
         return key;
 }
@@ -1283,6 +1606,7 @@ key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
         case KEY_DSA_CERT_V00:
         case KEY_RSA_CERT_V00:
         case KEY_DSA_CERT:
+        case KEY_ECDSA_CERT:
         case KEY_RSA_CERT:
                 /* Use the existing blob */
                 buffer_append(&b, buffer_ptr(&key->cert->certblob),
@@ -1295,6 +1619,14 @@ key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
                 buffer_put_bignum2(&b, key->dsa->g);
                 buffer_put_bignum2(&b, key->dsa->pub_key);
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA:
+                buffer_put_cstring(&b, key_ssh_name(key));
+                buffer_put_cstring(&b, key_curve_nid_to_name(key->ecdsa_nid));
+                buffer_put_ecpoint(&b, EC_KEY_get0_group(key->ecdsa),
+                    EC_KEY_get0_public_key(key->ecdsa));
+                break;
+#endif
         case KEY_RSA:
                 buffer_put_cstring(&b, key_ssh_name(key));
                 buffer_put_bignum2(&b, key->rsa->e);
@@ -1328,6 +1660,11 @@ key_sign(
         case KEY_DSA_CERT:
         case KEY_DSA:
                 return ssh_dss_sign(key, sigp, lenp, data, datalen);
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+        case KEY_ECDSA:
+                return ssh_ecdsa_sign(key, sigp, lenp, data, datalen);
+#endif
         case KEY_RSA_CERT_V00:
         case KEY_RSA_CERT:
         case KEY_RSA:
@@ -1356,6 +1693,11 @@ key_verify(
         case KEY_DSA_CERT:
         case KEY_DSA:
                 return ssh_dss_verify(key, signature, signaturelen, data, datalen);
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+        case KEY_ECDSA:
+                return ssh_ecdsa_verify(key, signature, signaturelen, data, datalen);
+#endif
         case KEY_RSA_CERT_V00:
         case KEY_RSA_CERT:
         case KEY_RSA:
@@ -1375,7 +1717,9 @@ key_demote(const Key *k)
         pk = xcalloc(1, sizeof(*pk));
         pk->type = k->type;
         pk->flags = k->flags;
+        pk->ecdsa_nid = k->ecdsa_nid;
         pk->dsa = NULL;
+        pk->ecdsa = NULL;
         pk->rsa = NULL;
 
         switch (k->type) {
@@ -1408,6 +1752,18 @@ key_demote(const Key *k)
                 if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
                         fatal("key_demote: BN_dup failed");
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+                key_cert_copy(k, pk);
+                /* FALLTHROUGH */
+        case KEY_ECDSA:
+                if ((pk->ecdsa = EC_KEY_new_by_curve_name(pk->ecdsa_nid)) == NULL)
+                        fatal("key_demote: EC_KEY_new_by_curve_name failed");
+                if (EC_KEY_set_public_key(pk->ecdsa,
+                    EC_KEY_get0_public_key(k->ecdsa)) != 1)
+                        fatal("key_demote: EC_KEY_set_public_key failed");
+                break;
+#endif
         default:
                 fatal("key_free: bad key type %d", k->type);
                 break;
@@ -1426,6 +1782,7 @@ key_is_cert(const Key *k)
         case KEY_DSA_CERT_V00:
         case KEY_RSA_CERT:
         case KEY_DSA_CERT:
+        case KEY_ECDSA_CERT:
                 return 1;
         default:
                 return 0;
@@ -1443,6 +1800,8 @@ key_type_plain(int type)
         case KEY_DSA_CERT_V00:
         case KEY_DSA_CERT:
                 return KEY_DSA;
+        case KEY_ECDSA_CERT:
+                return KEY_ECDSA;
         default:
                 return type;
         }
@@ -1461,6 +1820,10 @@ key_to_certified(Key *k, int legacy)
                 k->cert = cert_new();
                 k->type = legacy ? KEY_DSA_CERT_V00 : KEY_DSA_CERT;
                 return 0;
+        case KEY_ECDSA:
+                k->cert = cert_new();
+                k->type = KEY_ECDSA_CERT;
+                return 0;
         default:
                 error("%s: key has incorrect type %s", __func__, key_type(k));
                 return -1;
@@ -1482,13 +1845,20 @@ key_drop_cert(Key *k)
                 cert_free(k->cert);
                 k->type = KEY_DSA;
                 return 0;
+        case KEY_ECDSA_CERT:
+                cert_free(k->cert);
+                k->type = KEY_ECDSA;
+                return 0;
         default:
                 error("%s: key has incorrect type %s", __func__, key_type(k));
                 return -1;
         }
 }
 
-/* Sign a KEY_RSA_CERT or KEY_DSA_CERT, (re-)generating the signed certblob */
+/*
+ * Sign a KEY_RSA_CERT, KEY_DSA_CERT or KEY_ECDSA_CERT, (re-)generating
+ * the signed certblob
+ */
 int
 key_certify(Key *k, Key *ca)
 {
@@ -1507,7 +1877,8 @@ key_certify(Key *k, Key *ca)
                 return -1;
         }
 
-        if (ca->type != KEY_RSA && ca->type != KEY_DSA) {
+        if (ca->type != KEY_RSA && ca->type != KEY_DSA &&
+            ca->type != KEY_ECDSA) {
                 error("%s: CA key has unsupported type %s", __func__,
                     key_type(ca));
                 return -1;
@@ -1519,7 +1890,7 @@ key_certify(Key *k, Key *ca)
         buffer_put_cstring(&k->cert->certblob, key_ssh_name(k));
 
         /* -v01 certs put nonce first */
-        if (k->type == KEY_DSA_CERT || k->type == KEY_RSA_CERT) {
+        if (!key_cert_is_legacy(k)) {
                 arc4random_buf(&nonce, sizeof(nonce));
                 buffer_put_string(&k->cert->certblob, nonce, sizeof(nonce));
         }
@@ -1532,6 +1903,15 @@ key_certify(Key *k, Key *ca)
                 buffer_put_bignum2(&k->cert->certblob, k->dsa->g);
                 buffer_put_bignum2(&k->cert->certblob, k->dsa->pub_key);
                 break;
+#ifdef OPENSSL_HAS_ECC
+        case KEY_ECDSA_CERT:
+                buffer_put_cstring(&k->cert->certblob,
+                    key_curve_nid_to_name(k->ecdsa_nid));
+                buffer_put_ecpoint(&k->cert->certblob,
+                    EC_KEY_get0_group(k->ecdsa),
+                    EC_KEY_get0_public_key(k->ecdsa));
+                break;
+#endif
         case KEY_RSA_CERT_V00:
         case KEY_RSA_CERT:
                 buffer_put_bignum2(&k->cert->certblob, k->rsa->e);
@@ -1545,7 +1925,7 @@ key_certify(Key *k, Key *ca)
         }
 
         /* -v01 certs have a serial number next */
-        if (k->type == KEY_DSA_CERT || k->type == KEY_RSA_CERT)
+        if (!key_cert_is_legacy(k))
                 buffer_put_int64(&k->cert->certblob, k->cert->serial);
 
         buffer_put_int(&k->cert->certblob, k->cert->type);
@@ -1564,14 +1944,14 @@ key_certify(Key *k, Key *ca)
             buffer_ptr(&k->cert->critical), buffer_len(&k->cert->critical));
 
         /* -v01 certs have non-critical options here */
-        if (k->type == KEY_DSA_CERT || k->type == KEY_RSA_CERT) {
+        if (!key_cert_is_legacy(k)) {
                 buffer_put_string(&k->cert->certblob,
                     buffer_ptr(&k->cert->extensions),
                     buffer_len(&k->cert->extensions));
         }
 
         /* -v00 certs put the nonce at the end */
-        if (k->type == KEY_DSA_CERT_V00 || k->type == KEY_RSA_CERT_V00)
+        if (key_cert_is_legacy(k))
                 buffer_put_string(&k->cert->certblob, nonce, sizeof(nonce));
 
         buffer_put_string(&k->cert->certblob, NULL, 0); /* reserved */
@@ -1656,3 +2036,240 @@ key_cert_is_legacy(Key *k)
                 return 0;
         }
 }
+
+/* XXX: these are really begging for a table-driven approach */
+int
+key_curve_name_to_nid(const char *name)
+{
+#ifdef OPENSSL_HAS_ECC
+        if (strcmp(name, "nistp256") == 0)
+                return NID_X9_62_prime256v1;
+        else if (strcmp(name, "nistp384") == 0)
+                return NID_secp384r1;
+        else if (strcmp(name, "nistp521") == 0)
+                return NID_secp521r1;
+#endif
+
+        debug("%s: unsupported EC curve name \"%.100s\"", __func__, name);
+        return -1;
+}
+
+u_int
+key_curve_nid_to_bits(int nid)
+{
+        switch (nid) {
+#ifdef OPENSSL_HAS_ECC
+        case NID_X9_62_prime256v1:
+                return 256;
+        case NID_secp384r1:
+                return 384;
+        case NID_secp521r1:
+                return 521;
+#endif
+        default:
+                error("%s: unsupported EC curve nid %d", __func__, nid);
+                return 0;
+        }
+}
+
+const char *
+key_curve_nid_to_name(int nid)
+{
+#ifdef OPENSSL_HAS_ECC
+        if (nid == NID_X9_62_prime256v1)
+                return "nistp256";
+        else if (nid == NID_secp384r1)
+                return "nistp384";
+        else if (nid == NID_secp521r1)
+                return "nistp521";
+#endif
+        error("%s: unsupported EC curve nid %d", __func__, nid);
+        return NULL;
+}
+
+#ifdef OPENSSL_HAS_ECC
+const EVP_MD *
+key_ec_nid_to_evpmd(int nid)
+{
+        int kbits = key_curve_nid_to_bits(nid);
+
+        if (kbits == 0)
+                fatal("%s: invalid nid %d", __func__, nid);
+        /* RFC5656 section 6.2.1 */
+        if (kbits <= 256)
+                return EVP_sha256();
+        else if (kbits <= 384)
+                return EVP_sha384();
+        else
+                return EVP_sha512();
+}
+
+int
+key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public)
+{
+        BN_CTX *bnctx;
+        EC_POINT *nq = NULL;
+        BIGNUM *order, *x, *y, *tmp;
+        int ret = -1;
+
+        if ((bnctx = BN_CTX_new()) == NULL)
+                fatal("%s: BN_CTX_new failed", __func__);
+        BN_CTX_start(bnctx);
+
+        /*
+         * We shouldn't ever hit this case because bignum_get_ecpoint()
+         * refuses to load GF2m points.
+         */
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
+            NID_X9_62_prime_field) {
+                error("%s: group is not a prime field", __func__);
+                goto out;
+        }
+
+        /* Q != infinity */
+        if (EC_POINT_is_at_infinity(group, public)) {
+                error("%s: received degenerate public key (infinity)",
+                    __func__);
+                goto out;
+        }
+
+        if ((x = BN_CTX_get(bnctx)) == NULL ||
+            (y = BN_CTX_get(bnctx)) == NULL ||
+            (order = BN_CTX_get(bnctx)) == NULL ||
+            (tmp = BN_CTX_get(bnctx)) == NULL)
+                fatal("%s: BN_CTX_get failed", __func__);
+
+        /* log2(x) > log2(order)/2, log2(y) > log2(order)/2 */
+        if (EC_GROUP_get_order(group, order, bnctx) != 1)
+                fatal("%s: EC_GROUP_get_order failed", __func__);
+        if (EC_POINT_get_affine_coordinates_GFp(group, public,
+            x, y, bnctx) != 1)
+                fatal("%s: EC_POINT_get_affine_coordinates_GFp", __func__);
+        if (BN_num_bits(x) <= BN_num_bits(order) / 2) {
+                error("%s: public key x coordinate too small: "
+                    "bits(x) = %d, bits(order)/2 = %d", __func__,
+                    BN_num_bits(x), BN_num_bits(order) / 2);
+                goto out;
+        }
+        if (BN_num_bits(y) <= BN_num_bits(order) / 2) {
+                error("%s: public key y coordinate too small: "
+                    "bits(y) = %d, bits(order)/2 = %d", __func__,
+                    BN_num_bits(x), BN_num_bits(order) / 2);
+                goto out;
+        }
+
+        /* nQ == infinity (n == order of subgroup) */
+        if ((nq = EC_POINT_new(group)) == NULL)
+                fatal("%s: BN_CTX_tmp failed", __func__);
+        if (EC_POINT_mul(group, nq, NULL, public, order, bnctx) != 1)
+                fatal("%s: EC_GROUP_mul failed", __func__);
+        if (EC_POINT_is_at_infinity(group, nq) != 1) {
+                error("%s: received degenerate public key (nQ != infinity)",
+                    __func__);
+                goto out;
+        }
+
+        /* x < order - 1, y < order - 1 */
+        if (!BN_sub(tmp, order, BN_value_one()))
+                fatal("%s: BN_sub failed", __func__);
+        if (BN_cmp(x, tmp) >= 0) {
+                error("%s: public key x coordinate >= group order - 1",
+                    __func__);
+                goto out;
+        }
+        if (BN_cmp(y, tmp) >= 0) {
+                error("%s: public key y coordinate >= group order - 1",
+                    __func__);
+                goto out;
+        }
+        ret = 0;
+ out:
+        BN_CTX_free(bnctx);
+        EC_POINT_free(nq);
+        return ret;
+}
+
+int
+key_ec_validate_private(const EC_KEY *key)
+{
+        BN_CTX *bnctx;
+        BIGNUM *order, *tmp;
+        int ret = -1;
+
+        if ((bnctx = BN_CTX_new()) == NULL)
+                fatal("%s: BN_CTX_new failed", __func__);
+        BN_CTX_start(bnctx);
+
+        if ((order = BN_CTX_get(bnctx)) == NULL ||
+            (tmp = BN_CTX_get(bnctx)) == NULL)
+                fatal("%s: BN_CTX_get failed", __func__);
+
+        /* log2(private) > log2(order)/2 */
+        if (EC_GROUP_get_order(EC_KEY_get0_group(key), order, bnctx) != 1)
+                fatal("%s: EC_GROUP_get_order failed", __func__);
+        if (BN_num_bits(EC_KEY_get0_private_key(key)) <=
+            BN_num_bits(order) / 2) {
+                error("%s: private key too small: "
+                    "bits(y) = %d, bits(order)/2 = %d", __func__,
+                    BN_num_bits(EC_KEY_get0_private_key(key)),
+                    BN_num_bits(order) / 2);
+                goto out;
+        }
+
+        /* private < order - 1 */
+        if (!BN_sub(tmp, order, BN_value_one()))
+                fatal("%s: BN_sub failed", __func__);
+        if (BN_cmp(EC_KEY_get0_private_key(key), tmp) >= 0) {
+                error("%s: private key >= group order - 1", __func__);
+                goto out;
+        }
+        ret = 0;
+ out:
+        BN_CTX_free(bnctx);
+        return ret;
+}
+
+#if defined(DEBUG_KEXECDH) || defined(DEBUG_PK)
+void
+key_dump_ec_point(const EC_GROUP *group, const EC_POINT *point)
+{
+        BIGNUM *x, *y;
+        BN_CTX *bnctx;
+
+        if (point == NULL) {
+                fputs("point=(NULL)\n", stderr);
+                return;
+        }
+        if ((bnctx = BN_CTX_new()) == NULL)
+                fatal("%s: BN_CTX_new failed", __func__);
+        BN_CTX_start(bnctx);
+        if ((x = BN_CTX_get(bnctx)) == NULL || (y = BN_CTX_get(bnctx)) == NULL)
+                fatal("%s: BN_CTX_get failed", __func__);
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
+            NID_X9_62_prime_field)
+                fatal("%s: group is not a prime field", __func__);
+        if (EC_POINT_get_affine_coordinates_GFp(group, point, x, y, bnctx) != 1)
+                fatal("%s: EC_POINT_get_affine_coordinates_GFp", __func__);
+        fputs("x=", stderr);
+        BN_print_fp(stderr, x);
+        fputs("\ny=", stderr);
+        BN_print_fp(stderr, y);
+        fputs("\n", stderr);
+        BN_CTX_free(bnctx);
+}
+
+void
+key_dump_ec_key(const EC_KEY *key)
+{
+        const BIGNUM *exponent;
+
+        key_dump_ec_point(EC_KEY_get0_group(key), EC_KEY_get0_public_key(key));
+        fputs("exponent=", stderr);
+        if ((exponent = EC_KEY_get0_private_key(key)) == NULL)
+                fputs("(NULL)", stderr);
+        else
+                BN_print_fp(stderr, EC_KEY_get0_private_key(key));
+        fputs("\n", stderr);
+}
+#endif /* defined(DEBUG_KEXECDH) || defined(DEBUG_PK) */
+#endif /* OPENSSL_HAS_ECC */