- markus@cvs.openbsd.org 2001/07/02 22:29:20

[openssh.git] / readpass.c

diff --git a/readpass.c b/readpass.c
index b93eaba4360a6529a74b18db9248727e00c3b8e9..4eeeed9178ac5bfd5f9f31ca479c806f61721893 100644 (file)
--- a/readpass.c
+++ b/readpass.c
@@ -32,18 +32,17 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.15 2001/04/18 21:57:41 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.20 2001/07/02 22:29:20 markus Exp $");
 
 #include "xmalloc.h"
-#include "cli.h"
 #include "readpass.h"
 #include "pathnames.h"
 #include "log.h"
 #include "atomicio.h"
 #include "ssh.h"
 
-char *
-ssh_askpass(char *askpass, char *msg)
+static char *
+ssh_askpass(char *askpass, const char *msg)
 {
        pid_t pid;
        size_t len;
@@ -84,27 +83,24 @@ ssh_askpass(char *askpass, char *msg)
        return pass;
 }
 
-
-/*
- * Reads a passphrase from /dev/tty with echo turned off.  Returns the
- * passphrase (allocated with xmalloc), being very careful to ensure that
- * no other userland buffer is storing the password.
- */
 /*
- * Note:  the funcationallity of this routing has been moved to
- * cli_read_passphrase().  This routing remains to maintain
- * compatibility with existing code.
+ * Reads a passphrase from /dev/tty with echo turned off/on.  Returns the
+ * passphrase (allocated with xmalloc).  Exits if EOF is encountered. If
+ * RP_ALLOW_STDIN is set, the passphrase will be read from stdin if no
+ * tty is available
  */
 char *
-read_passphrase(const char *prompt, int from_stdin)
+read_passphrase(const char *prompt, int flags)
 {
-       char *askpass = NULL;
-       int use_askpass = 0, ttyfd;
+       char *askpass = NULL, *ret, buf[1024];
+       int rppflags, use_askpass = 0, ttyfd;
 
-       if (from_stdin) {
+       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);
@@ -120,5 +116,10 @@ read_passphrase(const char *prompt, int from_stdin)
                return ssh_askpass(askpass, prompt);
        }
 
-       return cli_read_passphrase(prompt, from_stdin, 0);
+       if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL)
+               return xstrdup("");
+
+       ret = xstrdup(buf);
+       memset(buf, 'x', sizeof buf);
+       return ret;
 }