- markus@cvs.openbsd.org 2003/01/23 13:50:27

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 315d9401865a843824c49e85bca96f8322b172a9..0c2ce163cf6d36470d9c40d571439cb9b38698b2 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.55 2002/06/05 20:56:39 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.65 2003/01/23 13:50:27 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -48,6 +48,7 @@ RCSID("$OpenBSD: ssh-add.c,v 1.55 2002/06/05 20:56:39 markus Exp $");
 #include "authfile.h"
 #include "pathnames.h"
 #include "readpass.h"
+#include "misc.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -66,6 +67,11 @@ static char *default_files[] = {
        NULL
 };
 
+/* Default lifetime (0 == forever) */
+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;
@@ -161,11 +167,23 @@ add_file(AuthenticationConnection *ac, const char *filename)
                        strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
                }
        }
-       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
+               if (lifetime != 0)
+                       fprintf(stderr,
+                           "Lifetime set to %d seconds\n", lifetime);
+               if (confirm != 0)
+                       fprintf(stderr,
+                           "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);
        key_free(private);
@@ -233,7 +251,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) {
@@ -253,7 +271,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
@@ -279,7 +297,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");
@@ -307,7 +327,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:")) != -1) {
+       while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
                switch (ch) {
                case 'l':
                case 'L':
@@ -321,6 +341,9 @@ main(int argc, char **argv)
                                ret = 1;
                        goto done;
                        break;
+               case 'c':
+                       confirm = 1;
+                       break;
                case 'd':
                        deleting = 1;
                        break;
@@ -336,6 +359,13 @@ main(int argc, char **argv)
                        deleting = 1;
                        sc_reader_id = optarg;
                        break;
+               case 't':
+                       if ((lifetime = convtime(optarg)) == -1) {
+                               fprintf(stderr, "Invalid lifetime\n");
+                               ret = 1;
+                               goto done;
+                       }
+                       break;
                default:
                        usage();
                        ret = 1;