- fgsch@cvs.openbsd.org 2003/01/07 23:42:54

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index e4aa8a52238641c1cf475e5910374aa89f4ed096..4f4ab3a06b4cb780648caf72fb86e9b6fe4f7872 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.64 2002/11/21 23:03:51 deraadt Exp $");
 
 #include <openssl/evp.h>
 
@@ -48,6 +48,7 @@ RCSID("$OpenBSD: ssh-add.c,v 1.56 2002/06/05 21:55:44 markus Exp $");
 #include "authfile.h"
 #include "pathnames.h"
 #include "readpass.h"
+#include "misc.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -67,7 +68,7 @@ static char *default_files[] = {
 };
 
 /* Default lifetime (0 == forever) */
-static u_int lifetime = 0;
+static int lifetime = 0;
 
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
@@ -163,22 +164,18 @@ 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)) {
                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 {
-                       fprintf(stderr,
-                           "Could not set lifetime for identity: %s\n",
-                           filename);
-               }
+                           "Lifetime set to %d seconds\n", lifetime);
+       } 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);
@@ -247,7 +244,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 +264,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,7 +290,7 @@ 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");
 #ifdef SMARTCARD
        fprintf(stderr, "  -s reader   Add key in smartcard reader.\n");
@@ -352,7 +349,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();