- (djm) Big OpenBSD sync:

   - markus@cvs.openbsd.org  2000/09/30 10:27:44
     [log.c]
     allow loglevel debug
   - markus@cvs.openbsd.org  2000/10/03 11:59:57
     [packet.c]
     hmac->mac
   - markus@cvs.openbsd.org  2000/10/03 12:03:03
     [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
     move fake-auth from auth1.c to individual auth methods, disables s/key in
     debug-msg
   - markus@cvs.openbsd.org  2000/10/03 12:16:48
     ssh.c
     do not resolve canonname, i have no idea why this was added oin ossh
   - markus@cvs.openbsd.org  2000/10/09 15:30:44
     ssh-keygen.1 ssh-keygen.c
     -X now reads private ssh.com DSA keys, too.
   - markus@cvs.openbsd.org  2000/10/09 15:32:34
     auth-options.c
     clear options on every call.
   - markus@cvs.openbsd.org  2000/10/09 15:51:00
     authfd.c authfd.h
     interop with ssh-agent2, from <res@shore.net>
   - markus@cvs.openbsd.org  2000/10/10 14:20:45
     compat.c
     use rexexp for version string matching
   - provos@cvs.openbsd.org  2000/10/10 22:02:18
     [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
     First rough implementation of the diffie-hellman group exchange.  The
     client can ask the server for bigger groups to perform the diffie-hellman
     in, thus increasing the attack complexity when using ciphers with longer
     keys.  University of Windsor provided network, T the company.
   - markus@cvs.openbsd.org  2000/10/11 13:59:52
     [auth-rsa.c auth2.c]
     clear auth options unless auth sucessfull
   - markus@cvs.openbsd.org  2000/10/11 14:00:27
     [auth-options.h]
     clear auth options unless auth sucessfull
   - markus@cvs.openbsd.org  2000/10/11 14:03:27
     [scp.1 scp.c]
     support 'scp -o' with help from mouring@pconline.com
   - markus@cvs.openbsd.org  2000/10/11 14:11:35
     [dh.c]
     Wall
   - markus@cvs.openbsd.org  2000/10/11 14:14:40
     [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
     [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
     add support for s/key (kbd-interactive) to ssh2, based on work by
     mkiernan@avantgo.com and me
   - markus@cvs.openbsd.org  2000/10/11 14:27:24
     [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
     [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
     [sshconnect2.c sshd.c]
     new cipher framework
   - markus@cvs.openbsd.org  2000/10/11 14:45:21
     [cipher.c]
     remove DES
   - markus@cvs.openbsd.org  2000/10/12 03:59:20
     [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
     enable DES in SSH-1 clients only
   - markus@cvs.openbsd.org  2000/10/12 08:21:13
     [kex.h packet.c]
     remove unused
   - markus@cvs.openbsd.org  2000/10/13 12:34:46
     [sshd.c]
     Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
   - markus@cvs.openbsd.org  2000/10/13 12:59:15
     [cipher.c cipher.h myproposal.h  rijndael.c rijndael.h]
     rijndael/aes support
   - markus@cvs.openbsd.org  2000/10/13 13:10:54
     [sshd.8]
     more info about -V
   - markus@cvs.openbsd.org  2000/10/13 13:12:02
     [myproposal.h]
     prefer no compression

1 files changed, 9 insertions, 73 deletions

diff --git a/readpass.c b/readpass.c
index c38292f15..f3a7dcbed 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,88 +32,24 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.11 2000/06/20 01:39:44 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.12 2000/10/11 20:14:39 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
-
-volatile int intr;
-
-void
-intcatch()
-{
-        intr = 1;
-}
+#include "cli.h"
 
 /*
  * 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.
+ */
 char *
-read_passphrase(const char *prompt, int from_stdin)
+read_passphrase(char *prompt, int from_stdin)
 {
-        char buf[1024], *p, ch;
-        struct termios tio, saved_tio;
-        sigset_t oset, nset;
-        struct sigaction sa, osa;
-        int input, output, echo = 0;
-
-        if (from_stdin) {
-                input = STDIN_FILENO;
-                output = STDERR_FILENO;
-        } else
-                input = output = open("/dev/tty", O_RDWR);
-
-        if (input == -1)
-                fatal("You have no controlling tty.  Cannot read passphrase.\n");
-
-        /* block signals, get terminal modes and turn off echo */
-        sigemptyset(&nset);
-        sigaddset(&nset, SIGTSTP);
-        (void) sigprocmask(SIG_BLOCK, &nset, &oset);
-        memset(&sa, 0, sizeof(sa));
-        sa.sa_handler = intcatch;
-        (void) sigaction(SIGINT, &sa, &osa);
-
-        intr = 0;
-
-        if (tcgetattr(input, &saved_tio) == 0 && (saved_tio.c_lflag & ECHO)) {
-                echo = 1;
-                tio = saved_tio;
-                tio.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
-                (void) tcsetattr(input, TCSANOW, &tio);
-        }
-
-        fflush(stdout);
-
-        (void)write(output, prompt, strlen(prompt));
-        for (p = buf; read(input, &ch, 1) == 1 && ch != '\n';) {
-                if (intr)
-                        break;
-                if (p < buf + sizeof(buf) - 1)
-                        *p++ = ch;
-        }
-        *p = '\0';
-        if (!intr)
-                (void)write(output, "\n", 1);
-
-        /* restore terminal modes and allow signals */
-        if (echo)
-                tcsetattr(input, TCSANOW, &saved_tio);
-        (void) sigprocmask(SIG_SETMASK, &oset, NULL);
-        (void) sigaction(SIGINT, &osa, NULL);
-
-        if (intr) {
-                kill(getpid(), SIGINT);
-                sigemptyset(&nset);
-                /* XXX tty has not neccessarily drained by now? */
-                sigsuspend(&nset);
-        }
-
-        if (!from_stdin)
-                (void)close(input);
-        p = xstrdup(buf);
-        memset(buf, 0, sizeof(buf));
-        return (p);
+        return cli_read_passphrase(prompt, from_stdin, 0);
 }