[buildpkg.sh.in] Last minute fix didn't make it in the .in file. :-(

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index e4aa8a52238641c1cf475e5910374aa89f4ed096..709a36bc1eca350be7d765b505d0f4f8594b3ffa 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.56 2002/06/05 21:55:44 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $");
 
 #include <openssl/evp.h>
 
@@ -47,7 +47,7 @@ RCSID("$OpenBSD: ssh-add.c,v 1.56 2002/06/05 21:55:44 markus Exp $");
 #include "authfd.h"
 #include "authfile.h"
 #include "pathnames.h"
-#include "readpass.h"
+#include "misc.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -67,7 +67,10 @@ static char *default_files[] = {
 };
 
 /* Default lifetime (0 == forever) */
-static u_int lifetime = 0;
+static int lifetime = 0;
+
+/* User has to confirm key use */
+static int confirm = 0;
 
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
@@ -160,25 +163,26 @@ add_file(AuthenticationConnection *ac, const char *filename)
                        if (private != NULL)
                                break;
                        clear_pass();
-                       strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
+                       snprintf(msg, sizeof msg,
+                           "Bad passphrase, try again for %.200s: ", comment);
                }
        }
-       if (ssh_add_identity(ac, private, comment)) {
+
+       if (ssh_add_identity_constrained(ac, private, comment, lifetime,
+           confirm)) {
                fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
                ret = 0;
-       } else
-               fprintf(stderr, "Could not add identity: %s\n", filename);
-
-       if (ret == 0 && lifetime != 0) {
-               if (ssh_lifetime_identity(ac, private, lifetime)) {
+               if (lifetime != 0)
                        fprintf(stderr,
-                           "Lifetime set to %d seconds for: %s (%s)\n",
-                           lifetime, filename, comment);
-               } else {
+                           "Lifetime set to %d seconds\n", lifetime);
+               if (confirm != 0)
                        fprintf(stderr,
-                           "Could not set lifetime for identity: %s\n",
-                           filename);
-               }
+                           "The user has to confirm each use of the key\n");
+       } else if (ssh_add_identity(ac, private, comment)) {
+               fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
+               ret = 0;
+       } else {
+               fprintf(stderr, "Could not add identity: %s\n", filename);
        }
 
        xfree(comment);
@@ -191,20 +195,23 @@ static int
 update_card(AuthenticationConnection *ac, int add, const char *id)
 {
        char *pin;
+       int ret = -1;
 
        pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
        if (pin == NULL)
                return -1;
 
-       if (ssh_update_card(ac, add, id, pin)) {
+       if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
                fprintf(stderr, "Card %s: %s\n",
                    add ? "added" : "removed", id);
-               return 0;
+               ret = 0;
        } else {
                fprintf(stderr, "Could not %s card: %s\n",
                    add ? "add" : "remove", id);
-               return -1;
+               ret = -1;
        }
+       xfree(pin);
+       return ret;
 }
 
 static int
@@ -247,7 +254,7 @@ lock_agent(AuthenticationConnection *ac, int lock)
 {
        char prompt[100], *p1, *p2;
        int passok = 1, ret = -1;
- 
+
        strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
        p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
        if (lock) {
@@ -267,7 +274,7 @@ lock_agent(AuthenticationConnection *ac, int lock)
                fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
        memset(p1, 0, strlen(p1));
        xfree(p1);
-       return -1;
+       return (ret);
 }
 
 static int
@@ -293,8 +300,9 @@ usage(void)
        fprintf(stderr, "  -d          Delete identity.\n");
        fprintf(stderr, "  -D          Delete all identities.\n");
        fprintf(stderr, "  -x          Lock agent.\n");
-       fprintf(stderr, "  -x          Unlock agent.\n");
+       fprintf(stderr, "  -X          Unlock agent.\n");
        fprintf(stderr, "  -t life     Set lifetime (in seconds) when adding identities.\n");
+       fprintf(stderr, "  -c          Require confirmation to sign using identities\n");
 #ifdef SMARTCARD
        fprintf(stderr, "  -s reader   Add key in smartcard reader.\n");
        fprintf(stderr, "  -e reader   Remove key in smartcard reader.\n");
@@ -310,7 +318,7 @@ main(int argc, char **argv)
        char *sc_reader_id = NULL;
        int i, ch, deleting = 0, ret = 0;
 
-       __progname = get_progname(argv[0]);
+       __progname = ssh_get_progname(argv[0]);
        init_rng();
        seed_rng();
 
@@ -322,7 +330,7 @@ main(int argc, char **argv)
                fprintf(stderr, "Could not open a connection to your authentication agent.\n");
                exit(2);
        }
-       while ((ch = getopt(argc, argv, "lLdDxXe:s:t:")) != -1) {
+       while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
                switch (ch) {
                case 'l':
                case 'L':
@@ -336,6 +344,9 @@ main(int argc, char **argv)
                                ret = 1;
                        goto done;
                        break;
+               case 'c':
+                       confirm = 1;
+                       break;
                case 'd':
                        deleting = 1;
                        break;
@@ -352,7 +363,11 @@ main(int argc, char **argv)
                        sc_reader_id = optarg;
                        break;
                case 't':
-                       lifetime = atoi(optarg);
+                       if ((lifetime = convtime(optarg)) == -1) {
+                               fprintf(stderr, "Invalid lifetime\n");
+                               ret = 1;
+                               goto done;
+                       }
                        break;
                default:
                        usage();