- (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 05ff4cab802a89a2e1957c8cede5e7f8c539d917..9240b0d1ea5b62896c3fecb147321485dfb34fbc 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.31 2001/03/26 08:07:08 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.38 2001/06/06 23:19:35 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -55,11 +55,23 @@ extern char *__progname;
 char *__progname;
 #endif
 
+/* we keep a cache of one passphrases */
+static char *pass = NULL;
+void
+clear_pass(void)
+{
+       if (pass) {
+               memset(pass, 0, strlen(pass));
+               xfree(pass);
+               pass = NULL;
+       }
+}
+
 void
 delete_file(AuthenticationConnection *ac, const char *filename)
 {
        Key *public;
-       char *comment;
+       char *comment = NULL;
 
        public = key_load_public(filename, &comment);
        if (public == NULL) {
@@ -91,95 +103,42 @@ delete_all(AuthenticationConnection *ac)
                fprintf(stderr, "Failed to remove all identities.\n");
 }
 
-char *
-ssh_askpass(char *askpass, char *msg)
-{
-       pid_t pid;
-       size_t len;
-       char *nl, *pass;
-       int p[2], status;
-       char buf[1024];
-
-       if (fflush(stdout) != 0)
-               error("ssh_askpass: fflush: %s", strerror(errno));
-       if (askpass == NULL)
-               fatal("internal error: askpass undefined");
-       if (pipe(p) < 0)
-               fatal("ssh_askpass: pipe: %s", strerror(errno));
-       if ((pid = fork()) < 0)
-               fatal("ssh_askpass: fork: %s", strerror(errno));
-       if (pid == 0) {
-               close(p[0]);
-               if (dup2(p[1], STDOUT_FILENO) < 0)
-                       fatal("ssh_askpass: dup2: %s", strerror(errno));
-               execlp(askpass, askpass, msg, (char *) 0);
-               fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
-       }
-       close(p[1]);
-       len = read(p[0], buf, sizeof buf);
-       close(p[0]);
-       while (waitpid(pid, &status, 0) < 0)
-               if (errno != EINTR)
-                       break;
-       if (len <= 1)
-               return xstrdup("");
-       nl = strchr(buf, '\n');
-       if (nl)
-               *nl = '\0';
-       pass = xstrdup(buf);
-       memset(buf, 0, sizeof(buf));
-       return pass;
-}
-
 void
 add_file(AuthenticationConnection *ac, const char *filename)
 {
        struct stat st;
        Key *private;
-       char *comment, *askpass = NULL, *pass;
-       char buf[1024], msg[1024];
-       int interactive = isatty(STDIN_FILENO);
+       char *comment = NULL;
+       char msg[1024];
 
        if (stat(filename, &st) < 0) {
                perror(filename);
                exit(1);
        }
-       if (!interactive && getenv("DISPLAY")) {
-               if (getenv(SSH_ASKPASS_ENV))
-                       askpass = getenv(SSH_ASKPASS_ENV);
-               else
-                       askpass = _PATH_SSH_ASKPASS_DEFAULT;
-       }
-
        /* At first, try empty passphrase */
        private = key_load_private(filename, "", &comment);
        if (comment == NULL)
                comment = xstrdup(filename);
+       /* try last */
+       if (private == NULL && pass != NULL)
+               private = key_load_private(filename, pass, NULL);
        if (private == NULL) {
-               printf("Need passphrase for %.200s\n", filename);
-               if (!interactive && askpass == NULL) {
-                       xfree(comment);
-                       return;
-               }
-               snprintf(msg, sizeof msg, "Enter passphrase for %.200s", comment);
+               /* clear passphrase since it did not work */
+               clear_pass();
+               snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
+                  comment);
                for (;;) {
-                       if (interactive) {
-                               snprintf(buf, sizeof buf, "%s: ", msg);
-                               pass = read_passphrase(buf, 1);
-                       } else {
-                               pass = ssh_askpass(askpass, msg);
-                       }
+                       pass = read_passphrase(msg, 1);
                        if (strcmp(pass, "") == 0) {
-                               xfree(pass);
+                               clear_pass();
                                xfree(comment);
                                return;
                        }
                        private = key_load_private(filename, pass, &comment);
-                       memset(pass, 0, strlen(pass));
-                       xfree(pass);
                        if (private != NULL)
                                break;
-                       strlcpy(msg, "Bad passphrase, try again", sizeof msg);
+                       clear_pass();
+                       strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
                }
        }
        if (ssh_add_identity(ac, private, comment))
@@ -234,6 +193,7 @@ main(int argc, char **argv)
 
        __progname = get_progname(argv[0]);
        init_rng();
+       seed_rng();
 
        SSLeay_add_all_algorithms();
 
@@ -280,6 +240,7 @@ main(int argc, char **argv)
                else
                        add_file(ac, buf);
        }
+       clear_pass();
        ssh_close_authentication_connection(ac);
        exit(0);
 }