- 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 585b71487359df8985d2a47bdca70e9abfe22501..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.46 2001/10/02 08:38:50 djm Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.54 2002/06/05 19:57:12 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -58,6 +58,15 @@ char *__progname;
 /* argv0 */
 extern char *__progname;
 
+/* Default files to add */
+static char *default_files[] = {
+       _PATH_SSH_CLIENT_ID_RSA,
+       _PATH_SSH_CLIENT_ID_DSA,
+       _PATH_SSH_CLIENT_IDENTITY,
+       NULL
+};
+
+
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
 static void
@@ -90,7 +99,7 @@ delete_file(AuthenticationConnection *ac, const char *filename)
 
        key_free(public);
        xfree(comment);
-       
+
        return ret;
 }
 
@@ -160,25 +169,31 @@ add_file(AuthenticationConnection *ac, const char *filename)
 
        xfree(comment);
        key_free(private);
-       
+
        return ret;
 }
 
 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);
+                   add ? "added" : "removed", id);
                return 0;
        } else {
                fprintf(stderr, "Could not %s card: %s\n",
-                    add ? "add" : "remove", id);
+                   add ? "add" : "remove", id);
                return -1;
        }
 }
 
-static void
+static int
 list_identities(AuthenticationConnection *ac, int do_fp)
 {
        Key *key;
@@ -188,8 +203,8 @@ list_identities(AuthenticationConnection *ac, int do_fp)
 
        for (version = 1; version <= 2; version++) {
                for (key = ssh_get_first_identity(ac, &comment, version);
-                    key != NULL;
-                    key = ssh_get_next_identity(ac, &comment, version)) {
+                   key != NULL;
+                   key = ssh_get_next_identity(ac, &comment, version)) {
                        had_identities = 1;
                        if (do_fp) {
                                fp = key_fingerprint(key, SSH_FP_MD5,
@@ -206,8 +221,52 @@ 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
+do_file(AuthenticationConnection *ac, int deleting, char *file)
+{
+       if (deleting) {
+               if (delete_file(ac, file) == -1)
+                       return -1;
+       } else {
+               if (add_file(ac, file) == -1)
+                       return -1;
+       }
+       return 0;
 }
 
 static void
@@ -231,8 +290,6 @@ main(int argc, char **argv)
        extern char *optarg;
        extern int optind;
        AuthenticationConnection *ac = NULL;
-       struct passwd *pw;
-       char buf[1024];
        char *sc_reader_id = NULL;
        int i, ch, deleting = 0, ret = 0;
 
@@ -246,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':
@@ -267,7 +331,7 @@ main(int argc, char **argv)
                        sc_reader_id = optarg;
                        break;
                case 'e':
-                       deleting = 1; 
+                       deleting = 1;
                        sc_reader_id = optarg;
                        break;
                default:
@@ -284,30 +348,34 @@ main(int argc, char **argv)
                goto done;
        }
        if (argc == 0) {
-               pw = getpwuid(getuid());
-               if (!pw) {
+               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",
                            (u_int)getuid());
                        ret = 1;
                        goto done;
                }
-               snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, _PATH_SSH_CLIENT_IDENTITY);
-               if (deleting) {
-                       if (delete_file(ac, buf) == -1)
-                               ret = 1;
-               } else {
-                       if (add_file(ac, buf) == -1)
+
+               for(i = 0; default_files[i]; i++) {
+                       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 (deleting) {
-                               if (delete_file(ac, argv[i]) == -1)
-                                       ret = 1;
-                       } else {
-                               if (add_file(ac, argv[i]) == -1)
-                                       ret = 1;
-                       }
+               for(i = 0; i < argc; i++) {
+                       if (do_file(ac, deleting, argv[i]) == -1)
+                               ret = 1;
                }
        }
        clear_pass();