merge 5.7p1

1 files changed, 63 insertions, 4 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index 2c0e28696..afba413d7 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.166 2010/04/16 01:47:26 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.171 2010/11/21 01:01:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -468,6 +468,11 @@ process_add_identity(SocketEntry *e, int version)
         int type, success = 0, death = 0, confirm = 0;
         char *type_name, *comment;
         Key *k = NULL;
+#ifdef OPENSSL_HAS_ECC
+        BIGNUM *exponent;
+        EC_POINT *q;
+        char *curve;
+#endif
         u_char *cert;
         u_int len;
 
@@ -490,7 +495,6 @@ process_add_identity(SocketEntry *e, int version)
         case 2:
                 type_name = buffer_get_string(&e->request, NULL);
                 type = key_type_from_name(type_name);
-                xfree(type_name);
                 switch (type) {
                 case KEY_DSA:
                         k = key_new_private(type);
@@ -509,6 +513,59 @@ process_add_identity(SocketEntry *e, int version)
                         key_add_private(k);
                         buffer_get_bignum2(&e->request, k->dsa->priv_key);
                         break;
+#ifdef OPENSSL_HAS_ECC
+                case KEY_ECDSA:
+                        k = key_new_private(type);
+                        k->ecdsa_nid = key_ecdsa_nid_from_name(type_name);
+                        curve = buffer_get_string(&e->request, NULL);
+                        if (k->ecdsa_nid != key_curve_name_to_nid(curve))
+                                fatal("%s: curve names mismatch", __func__);
+                        xfree(curve);
+                        k->ecdsa = EC_KEY_new_by_curve_name(k->ecdsa_nid);
+                        if (k->ecdsa == NULL)
+                                fatal("%s: EC_KEY_new_by_curve_name failed",
+                                    __func__);
+                        q = EC_POINT_new(EC_KEY_get0_group(k->ecdsa));
+                        if (q == NULL)
+                                fatal("%s: BN_new failed", __func__);
+                        if ((exponent = BN_new()) == NULL)
+                                fatal("%s: BN_new failed", __func__);
+                        buffer_get_ecpoint(&e->request,
+                                EC_KEY_get0_group(k->ecdsa), q);
+                        buffer_get_bignum2(&e->request, exponent);
+                        if (EC_KEY_set_public_key(k->ecdsa, q) != 1)
+                                fatal("%s: EC_KEY_set_public_key failed",
+                                    __func__);
+                        if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1)
+                                fatal("%s: EC_KEY_set_private_key failed",
+                                    __func__);
+                        if (key_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
+                            EC_KEY_get0_public_key(k->ecdsa)) != 0)
+                                fatal("%s: bad ECDSA public key", __func__);
+                        if (key_ec_validate_private(k->ecdsa) != 0)
+                                fatal("%s: bad ECDSA private key", __func__);
+                        BN_clear_free(exponent);
+                        EC_POINT_free(q);
+                        break;
+                case KEY_ECDSA_CERT:
+                        cert = buffer_get_string(&e->request, &len);
+                        if ((k = key_from_blob(cert, len)) == NULL)
+                                fatal("Certificate parse failed");
+                        xfree(cert);
+                        key_add_private(k);
+                        if ((exponent = BN_new()) == NULL)
+                                fatal("%s: BN_new failed", __func__);
+                        buffer_get_bignum2(&e->request, exponent);
+                        if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1)
+                                fatal("%s: EC_KEY_set_private_key failed",
+                                    __func__);
+                        if (key_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
+                            EC_KEY_get0_public_key(k->ecdsa)) != 0 ||
+                            key_ec_validate_private(k->ecdsa) != 0)
+                                fatal("%s: bad ECDSA key", __func__);
+                        BN_clear_free(exponent);
+                        break;
+#endif /* OPENSSL_HAS_ECC */
                 case KEY_RSA:
                         k = key_new_private(type);
                         buffer_get_bignum2(&e->request, k->rsa->n);
@@ -534,9 +591,11 @@ process_add_identity(SocketEntry *e, int version)
                         buffer_get_bignum2(&e->request, k->rsa->q);
                         break;
                 default:
+                        xfree(type_name);
                         buffer_clear(&e->request);
                         goto send;
                 }
+                xfree(type_name);
                 break;
         }
         /* enable blinding */
@@ -1092,7 +1151,7 @@ main(int ac, char **av)
         prctl(PR_SET_DUMPABLE, 0);
 #endif
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
 
         __progname = ssh_get_progname(av[0]);
         init_rng();
@@ -1173,7 +1232,7 @@ main(int ac, char **av)
 
         if (agentsocket == NULL) {
                 /* Create private directory for agent socket */
-                strlcpy(socket_dir, "/tmp/ssh-XXXXXXXXXX", sizeof socket_dir);
+                mktemp_proto(socket_dir, sizeof(socket_dir));
                 if (mkdtemp(socket_dir) == NULL) {
                         perror("mkdtemp: private socket dir");
                         exit(1);