src/usr.bin/ssh/readpass.c - diff

Return to readpass.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readpass.c between version 1.12 and 1.12.2.5

-version 1.12, 2000/10/11 20:14:39
+version 1.12.2.5, 2001/09/27 00:15:42
 Line 34
 Line 34
 Line 34
  #include "includes.h"
  RCSID("$OpenBSD$");
+ #include <readpassphrase.h>
  #include "xmalloc.h"
+ #include "readpass.h"
+ #include "pathnames.h"
+ #include "log.h"
  #include "ssh.h"
- #include "cli.h"
+ static char *
+ ssh_askpass(char *askpass, const 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) {
+                 error("ssh_askpass: pipe: %s", strerror(errno));
+                 return xstrdup("");
+         }
+         if ((pid = fork()) < 0) {
+                 error("ssh_askpass: fork: %s", strerror(errno));
+                 return xstrdup("");
+         }
+         if (pid == 0) {
+                 seteuid(getuid());
+                 setuid(getuid());
+                 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;
+ }
  /*
-  * Reads a passphrase from /dev/tty with echo turned off.  Returns the
+  * Reads a passphrase from /dev/tty with echo turned off/on.  Returns the
-  * passphrase (allocated with xmalloc), being very careful to ensure that
+  * passphrase (allocated with xmalloc).  Exits if EOF is encountered. If
-  * no other userland buffer is storing the password.
+  * RP_ALLOW_STDIN is set, the passphrase will be read from stdin if no
+  * tty is available
   */
- /*
-  * Note:  the funcationallity of this routing has been moved to
-  * cli_read_passphrase().  This routing remains to maintain
-  * compatibility with existing code.
-  */
  char *
- read_passphrase(char *prompt, int from_stdin)
+ read_passphrase(const char *prompt, int flags)
  {
-         return cli_read_passphrase(prompt, from_stdin, 0);
+         char *askpass = NULL, *ret, buf[1024];
+         int rppflags, use_askpass = 0, ttyfd;
+         rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF;
+         if (flags & RP_ALLOW_STDIN) {
+                 if (!isatty(STDIN_FILENO))
+                         use_askpass = 1;
+         } else {
+                 rppflags |= RPP_REQUIRE_TTY;
+                 ttyfd = open("/dev/tty", O_RDWR);
+                 if (ttyfd >= 0)
+                         close(ttyfd);
+                 else
+                         use_askpass = 1;
+         }
+         if (use_askpass && getenv("DISPLAY")) {
+                 if (getenv(SSH_ASKPASS_ENV))
+                         askpass = getenv(SSH_ASKPASS_ENV);
+                 else
+                         askpass = _PATH_SSH_ASKPASS_DEFAULT;
+                 return ssh_askpass(askpass, prompt);
+         }
+         if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL)
+                 return xstrdup("");
+         ret = xstrdup(buf);
+         memset(buf, 'x', sizeof buf);
+         return ret;
  }