- markus@cvs.openbsd.org 2002/06/05 19:57:12

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 6d79357cce79ced05790b5a0e879ac07258b2096..ecf4666defd1c9f3fc25f793514ebc0b346380e2 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.49 2001/12/24 07:29:43 deraadt Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.54 2002/06/05 19:57:12 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -62,7 +62,7 @@ extern char *__progname;
 static char *default_files[] = {
        _PATH_SSH_CLIENT_ID_RSA,
        _PATH_SSH_CLIENT_ID_DSA,
-       _PATH_SSH_CLIENT_IDENTITY, 
+       _PATH_SSH_CLIENT_IDENTITY,
        NULL
 };
 
@@ -176,7 +176,13 @@ add_file(AuthenticationConnection *ac, const char *filename)
 static int
 update_card(AuthenticationConnection *ac, int add, const char *id)
 {
-       if (ssh_update_card(ac, add, id)) {
+       char *pin;
+
+       pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
+       if (pin == NULL)
+               return -1;
+
+       if (ssh_update_card(ac, add, id, pin)) {
                fprintf(stderr, "Card %s: %s\n",
                    add ? "added" : "removed", id);
                return 0;
@@ -187,7 +193,7 @@ update_card(AuthenticationConnection *ac, int add, const char *id)
        }
 }
 
-static void
+static int
 list_identities(AuthenticationConnection *ac, int do_fp)
 {
        Key *key;
@@ -215,8 +221,39 @@ list_identities(AuthenticationConnection *ac, int do_fp)
                        xfree(comment);
                }
        }
-       if (!had_identities)
+       if (!had_identities) {
                printf("The agent has no identities.\n");
+               return -1;
+       }
+       return 0;
+}
+
+static int
+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) {
+               strlcpy(prompt, "Again: ", sizeof prompt);
+               p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
+               if (strcmp(p1, p2) != 0) {
+                       fprintf(stderr, "Passwords do not match.\n");
+                       passok = 0;
+               }
+               memset(p2, 0, strlen(p2));
+               xfree(p2);
+       }
+       if (passok && ssh_lock_agent(ac, lock, p1)) {
+               fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
+               ret = 0;
+       } else
+               fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
+       memset(p1, 0, strlen(p1));
+       xfree(p1);
+       return -1;
 }
 
 static int
@@ -266,13 +303,20 @@ main(int argc, char **argv)
        ac = ssh_get_authentication_connection();
        if (ac == NULL) {
                fprintf(stderr, "Could not open a connection to your authentication agent.\n");
-               exit(1);
+               exit(2);
        }
-       while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
+       while ((ch = getopt(argc, argv, "lLdDxXe:s:")) != -1) {
                switch (ch) {
                case 'l':
                case 'L':
-                       list_identities(ac, ch == 'l' ? 1 : 0);
+                       if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
+                               ret = 1;
+                       goto done;
+                       break;
+               case 'x':
+               case 'X':
+                       if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
+                               ret = 1;
                        goto done;
                        break;
                case 'd':
@@ -306,6 +350,8 @@ main(int argc, char **argv)
        if (argc == 0) {
                char buf[MAXPATHLEN];
                struct passwd *pw;
+               struct stat st;
+               int count = 0;
 
                if ((pw = getpwuid(getuid())) == NULL) {
                        fprintf(stderr, "No user found with uid %u\n",
@@ -315,11 +361,17 @@ main(int argc, char **argv)
                }
 
                for(i = 0; default_files[i]; i++) {
-                       snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, 
+                       snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
                            default_files[i]);
+                       if (stat(buf, &st) < 0)
+                               continue;
                        if (do_file(ac, deleting, buf) == -1)
                                ret = 1;
+                       else
+                               count++;
                }
+               if (count == 0)
+                       ret = 1;
        } else {
                for(i = 0; i < argc; i++) {
                        if (do_file(ac, deleting, argv[i]) == -1)