- (djm) Bring in readpassphrase() from OpenBSD libc. Compiles OK on Linux and

   Solaris

7 files changed, 211 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 932d6f757..c07672949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,8 @@
      [ttymodes.c]
      passing modes works fine: debug2->3
  - (djm) -Wall fix for session.c
+ - (djm) Bring in readpassphrase() from OpenBSD libc. Compiles OK on Linux and
+   Solaris
 
 20010622
  - (stevesk) handle systems without pw_expire and pw_change.
@@ -5789,4 +5791,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1324 2001/06/25 07:07:59 djm Exp $
+$Id: ChangeLog,v 1.1325 2001/06/25 08:09:16 djm Exp $
diff --git a/configure.in b/configure.in
index 69d15bb8a..199c1a694 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.291 2001/06/22 21:14:19 stevesk Exp $
+# $Id: configure.in,v 1.292 2001/06/25 08:09:17 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -460,7 +460,7 @@ AC_ARG_WITH(tcp-wrappers,
 )
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
 dnl    Checks for time functions
 AC_CHECK_FUNCS(gettimeofday time)
 dnl    Checks for libutil functions
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 2cf2774f2..64a089321 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.11 2001/06/10 17:24:52 mouring Exp $
+# $Id: Makefile.in,v 1.12 2001/06/25 08:09:17 djm Exp $
 
 sysconfdir=@sysconfdir@
 piddir=@piddir@
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 LDFLAGS=-L. @LDFLAGS@
 
-OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getusershell.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtok.o vis.o
+OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getusershell.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtok.o vis.o
 
 COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o
 
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 64d8fc5b7..9b8bf35fa 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.7 2001/06/10 17:24:53 mouring Exp $ */
+/* $Id: openbsd-compat.h,v 1.8 2001/06/25 08:09:17 djm Exp $ */
 
 #ifndef _OPENBSD_H
 #define _OPENBSD_H
@@ -28,6 +28,7 @@
 #include "getgrouplist.h"
 #include "glob.h"
 #include "getusershell.h"
+#include "readpassphrase.h"
 
 /* Home grown routines */
 #include "bsd-arc4random.h"
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
new file mode 100644
index 000000000..308e7cc5f
--- /dev/null
+++ b/openbsd-compat/readpassphrase.c
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.4 2001/06/18 17:41:39 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "includes.h"
+
+#ifndef HAVE_READPASSPHRASE
+
+#include <termios.h>
+#include <readpassphrase.h>
+
+#ifdef TCSASOFT
+# define _T_FLUSH       (TCSAFLUSH|TCSASOFT)
+#else
+# define _T_FLUSH       (TCSAFLUSH)
+#endif
+
+char *
+readpassphrase(prompt, buf, bufsiz, flags)
+        const char *prompt;
+        char *buf;
+        size_t bufsiz;
+        int flags;
+{
+        struct termios term;
+        char ch, *p, *end;
+        u_char status;
+        int echo, input, output;
+        sigset_t oset, nset;
+
+        /* I suppose we could alloc on demand in this case (XXX). */
+        if (bufsiz == 0) {
+                errno = EINVAL;
+                return(NULL);
+        }
+
+        /*
+         * Read and write to /dev/tty if available.  If not, read from
+         * stdin and write to stderr unless a tty is required.
+         */
+        if ((input = output = open(_PATH_TTY, O_RDWR)) == -1) {
+                if (flags & RPP_REQUIRE_TTY) {
+                        errno = ENOTTY;
+                        return(NULL);
+                }
+                input = STDIN_FILENO;
+                output = STDERR_FILENO;
+        }
+
+        /*
+         * We block SIGINT and SIGTSTP so the terminal is not left
+         * in an inconsistent state (ie: no echo).  It would probably
+         * be better to simply catch these though.
+         */
+        sigemptyset(&nset);
+        sigaddset(&nset, SIGINT);
+        sigaddset(&nset, SIGTSTP);
+        (void)sigprocmask(SIG_BLOCK, &nset, &oset);
+
+        /* Turn off echo if possible. */
+        echo = 0;
+        status = _POSIX_VDISABLE;
+        if (tcgetattr(input, &term) == 0) {
+                if (!(flags & RPP_ECHO_ON) && (term.c_lflag & ECHO)) {
+                        echo = 1;
+                        term.c_lflag &= ~ECHO;
+                }
+#ifdef VSTATUS
+                if (term.c_cc[VSTATUS] != _POSIX_VDISABLE) {
+                        status = term.c_cc[VSTATUS];
+                        term.c_cc[VSTATUS] = _POSIX_VDISABLE;
+                }
+#endif
+                (void)tcsetattr(input, _T_FLUSH, &term);
+        }
+        if (!(flags & RPP_ECHO_ON)) {
+                if (tcgetattr(input, &term) == 0 && (term.c_lflag & ECHO)) {
+                        echo = 1;
+                        term.c_lflag &= ~ECHO;
+                        (void)tcsetattr(input, _T_FLUSH, &term);
+                }
+        }
+
+        (void)write(output, prompt, strlen(prompt));
+        end = buf + bufsiz - 1;
+        for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) {
+                if (p < end) {
+                        if ((flags & RPP_SEVENBIT))
+                                ch = ch &= 0x7f;
+                        if (isalpha(ch)) {
+                                if ((flags & RPP_FORCELOWER))
+                                        ch = tolower(ch);
+                                if ((flags & RPP_FORCEUPPER))
+                                        ch = toupper(ch);
+                        }
+                        *p++ = ch;
+                }
+        }
+        *p = '\0';
+        if (echo || status != _POSIX_VDISABLE) {
+                if (echo) {
+                        (void)write(output, "\n", 1);
+                        term.c_lflag |= ECHO;
+                }
+#ifdef VSTATUS
+                if (status != _POSIX_VDISABLE)
+                        term.c_cc[VSTATUS] = status;
+#endif
+                (void)tcsetattr(input, _T_FLUSH, &term);
+        }
+        (void)sigprocmask(SIG_SETMASK, &oset, NULL);
+        if (input != STDIN_FILENO)
+                (void)close(input);
+        return(buf);
+}
+#endif /* HAVE_READPASSPHRASE */
+
+#if 0
+char *
+getpass(prompt)
+        const char *prompt;
+{
+        static char buf[_PASSWORD_LEN + 1];
+
+        return(readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF));
+}
+#endif
diff --git a/openbsd-compat/readpassphrase.h b/openbsd-compat/readpassphrase.h
new file mode 100644
index 000000000..9077b6e08
--- /dev/null
+++ b/openbsd-compat/readpassphrase.h
@@ -0,0 +1,48 @@
+/*      $OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $      */
+
+/*
+ * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _READPASSPHRASE_H_
+#define _READPASSPHRASE_H_
+
+#include "includes.h"
+
+#ifndef HAVE_READPASSPHRASE
+
+#define RPP_ECHO_OFF    0x00            /* Turn off echo (default). */
+#define RPP_ECHO_ON     0x01            /* Leave echo on. */
+#define RPP_REQUIRE_TTY 0x02            /* Fail if there is no tty. */
+#define RPP_FORCELOWER  0x04            /* Force input to lower case. */
+#define RPP_FORCEUPPER  0x08            /* Force input to upper case. */
+#define RPP_SEVENBIT    0x10            /* Strip the high bit from input. */
+
+char *readpassphrase(const char *, char *, size_t, int);
+
+#endif /* HAVE_READPASSPHRASE */
+
+#endif /* !_READPASSPHRASE_H_ */
diff --git a/readpass.c b/readpass.c
index 3b6ed72ba..10171cf67 100644
--- a/readpass.c
+++ b/readpass.c
@@ -34,8 +34,6 @@
 #include "includes.h"
 RCSID("$OpenBSD: readpass.c,v 1.19 2001/06/24 05:35:33 markus Exp $");
 
-#include <readpassphrase.h>
-
 #include "xmalloc.h"
 #include "readpass.h"
 #include "pathnames.h"