Libc-1439.100.3.tar.gz

[apple/libc.git] / gen / FreeBSD / readpassphrase.c

diff --git a/gen/FreeBSD/readpassphrase.c b/gen/FreeBSD/readpassphrase.c
index 45ac15f2963fedfe1a1e5978632be204a7811ba3..646a8c6d82dda32f256ae6622a17c739d9eb8630 100644 (file)
--- a/gen/FreeBSD/readpassphrase.c
+++ b/gen/FreeBSD/readpassphrase.c
@@ -1,37 +1,27 @@
-/*     $OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $     */
+/*     $OpenBSD: readpassphrase.c,v 1.24 2013/11/24 23:51:29 deraadt Exp $     */

 
 /*
 
 /*

- * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
+ * Copyright (c) 2000-2002, 2007, 2010
+ *     Todd C. Miller <Todd.Miller@courtesan.com>

  *
  *

- * 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.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.

  */
 
  */
 

-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $";
-#endif /* LIBC_SCCS and not lint */

 #include <sys/cdefs.h>
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/gen/readpassphrase.c,v 1.6 2002/03/09 03:16:41 green Exp $");

 
 #include "xlocale_private.h"
 
 
 #include "xlocale_private.h"
 


@@ -47,8 +37,9 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/readpassphrase.c,v 1.6 2002/03/09 03:16:41
 #include <unistd.h>
 #include <readpassphrase.h>
 #include "un-namespace.h"
 #include <unistd.h>
 #include <readpassphrase.h>
 #include "un-namespace.h"

+#include "libc_private.h"

 
 

-static volatile sig_atomic_t signo;
+static volatile int signo[NSIG];

 
 static void handler(int);
 
 
 static void handler(int);
 


@@ -56,11 +47,11 @@ char *
 readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
 {
        ssize_t nr;
 readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
 {
        ssize_t nr;

-       int input, output, save_errno;
+       int input, output, save_errno, i, need_restart, input_is_tty;

        char ch, *p, *end;
        struct termios term, oterm;
        char ch, *p, *end;
        struct termios term, oterm;

-       struct sigaction sa, saveint, savehup, savequit, saveterm;
-       struct sigaction savetstp, savettin, savettou;
+       struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
+       struct sigaction savetstp, savettin, savettou, savepipe;

        locale_t loc = __current_locale();
 
        /* I suppose we could alloc on demand in this case (XXX). */
        locale_t loc = __current_locale();
 
        /* I suppose we could alloc on demand in this case (XXX). */


@@ -70,59 +61,83 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
        }
 
 restart:
        }
 
 restart:

+       for (i = 0; i < NSIG; i++)
+               signo[i] = 0;
+       nr = -1;
+       save_errno = 0;
+       need_restart = 0;

        /*
         * Read and write to /dev/tty if available.  If not, read from
         * stdin and write to stderr unless a tty is required.
         */
        /*
         * 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_is_tty = 0;
+       if (!(flags & RPP_STDIN)) {
+               input = output = _open(_PATH_TTY, O_RDWR | O_CLOEXEC);
+               if (input == -1) {
+                       if (flags & RPP_REQUIRE_TTY) {
+                               errno = ENOTTY;
+                               return(NULL);
+                       }
+                       input = STDIN_FILENO;
+                       output = STDERR_FILENO;
+               } else {
+                       input_is_tty = 1;

                }
                }

+       } else {

                input = STDIN_FILENO;
                output = STDERR_FILENO;
        }
 
                input = STDIN_FILENO;
                output = STDERR_FILENO;
        }
 

+       /*
+        * Turn off echo if possible.
+        * If we are using a tty but are not the foreground pgrp this will
+        * generate SIGTTOU, so do it *before* installing the signal handlers.
+        */
+       if (input_is_tty && tcgetattr(input, &oterm) == 0) {
+               memcpy(&term, &oterm, sizeof(term));
+               if (!(flags & RPP_ECHO_ON))
+                       term.c_lflag &= ~(ECHO | ECHONL);
+               if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
+                       term.c_cc[VSTATUS] = _POSIX_VDISABLE;
+               (void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
+       } else {
+               memset(&term, 0, sizeof(term));
+               term.c_lflag |= ECHO;
+               memset(&oterm, 0, sizeof(oterm));
+               oterm.c_lflag |= ECHO;
+       }
+

        /*
         * Catch signals that would otherwise cause the user to end
         * up with echo turned off in the shell.  Don't worry about
        /*
         * Catch signals that would otherwise cause the user to end
         * up with echo turned off in the shell.  Don't worry about

-        * things like SIGALRM and SIGPIPE for now.
+        * things like SIGXCPU and SIGVTALRM for now.

         */
        sigemptyset(&sa.sa_mask);
        sa.sa_flags = 0;                /* don't restart system calls */
        sa.sa_handler = handler;
         */
        sigemptyset(&sa.sa_mask);
        sa.sa_flags = 0;                /* don't restart system calls */
        sa.sa_handler = handler;

-       (void)_sigaction(SIGINT, &sa, &saveint);
+       (void)_sigaction(SIGALRM, &sa, &savealrm);

        (void)_sigaction(SIGHUP, &sa, &savehup);
        (void)_sigaction(SIGHUP, &sa, &savehup);

+       (void)_sigaction(SIGINT, &sa, &saveint);
+       (void)_sigaction(SIGPIPE, &sa, &savepipe);

        (void)_sigaction(SIGQUIT, &sa, &savequit);
        (void)_sigaction(SIGTERM, &sa, &saveterm);
        (void)_sigaction(SIGTSTP, &sa, &savetstp);
        (void)_sigaction(SIGTTIN, &sa, &savettin);
        (void)_sigaction(SIGTTOU, &sa, &savettou);
 
        (void)_sigaction(SIGQUIT, &sa, &savequit);
        (void)_sigaction(SIGTERM, &sa, &saveterm);
        (void)_sigaction(SIGTSTP, &sa, &savetstp);
        (void)_sigaction(SIGTTIN, &sa, &savettin);
        (void)_sigaction(SIGTTOU, &sa, &savettou);
 

-       /* Turn off echo if possible. */
-       if (tcgetattr(input, &oterm) == 0) {
-               memcpy(&term, &oterm, sizeof(term));
-               if (!(flags & RPP_ECHO_ON))
-                       term.c_lflag &= ~(ECHO | ECHONL);
-               if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
-                       term.c_cc[VSTATUS] = _POSIX_VDISABLE;
-               (void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
-       } else {
-               memset(&term, 0, sizeof(term));
-               memset(&oterm, 0, sizeof(oterm));
-       }
-
-       (void)_write(output, prompt, strlen(prompt));
+       if (!(flags & RPP_STDIN))
+               (void)_write(output, prompt, strlen(prompt));

        end = buf + bufsiz - 1;
        end = buf + bufsiz - 1;

-       for (p = buf; (nr = _read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r';) {
+       p = buf;
+       while ((nr = _read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {

                if (p < end) {
                        if ((flags & RPP_SEVENBIT))
                                ch &= 0x7f;
                        if (isalpha_l(ch, loc)) {
                                if ((flags & RPP_FORCELOWER))
                if (p < end) {
                        if ((flags & RPP_SEVENBIT))
                                ch &= 0x7f;
                        if (isalpha_l(ch, loc)) {
                                if ((flags & RPP_FORCELOWER))

-                                       ch = tolower_l(ch, loc);
+                                       ch = (char)tolower_l(ch, loc);

                                if ((flags & RPP_FORCEUPPER))
                                if ((flags & RPP_FORCEUPPER))

-                                       ch = toupper_l(ch, loc);
+                                       ch = (char)toupper_l(ch, loc);

                        }
                        *p++ = ch;
                }
                        }
                        *p++ = ch;
                }


@@ -133,49 +148,66 @@ restart:
                (void)_write(output, "\n", 1);
 
        /* Restore old terminal settings and signals. */
                (void)_write(output, "\n", 1);
 
        /* Restore old terminal settings and signals. */

-       if (memcmp(&term, &oterm, sizeof(term)) != 0)
-               (void)tcsetattr(input, TCSANOW|TCSASOFT, &oterm);
-       (void)_sigaction(SIGINT, &saveint, NULL);
+       if (memcmp(&term, &oterm, sizeof(term)) != 0) {
+               while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
+                   errno == EINTR && !signo[SIGTTOU])
+                       continue;
+       }
+       (void)_sigaction(SIGALRM, &savealrm, NULL);

        (void)_sigaction(SIGHUP, &savehup, NULL);
        (void)_sigaction(SIGHUP, &savehup, NULL);

+       (void)_sigaction(SIGINT, &saveint, NULL);

        (void)_sigaction(SIGQUIT, &savequit, NULL);
        (void)_sigaction(SIGQUIT, &savequit, NULL);

+       (void)_sigaction(SIGPIPE, &savepipe, NULL);

        (void)_sigaction(SIGTERM, &saveterm, NULL);
        (void)_sigaction(SIGTSTP, &savetstp, NULL);
        (void)_sigaction(SIGTTIN, &savettin, NULL);
        (void)_sigaction(SIGTTOU, &savettou, NULL);
        (void)_sigaction(SIGTERM, &saveterm, NULL);
        (void)_sigaction(SIGTSTP, &savetstp, NULL);
        (void)_sigaction(SIGTTIN, &savettin, NULL);
        (void)_sigaction(SIGTTOU, &savettou, NULL);

-       if (input != STDIN_FILENO)
+       if (input_is_tty)

                (void)_close(input);
 
        /*
         * If we were interrupted by a signal, resend it to ourselves
         * now that we have restored the signal handlers.
         */
                (void)_close(input);
 
        /*
         * If we were interrupted by a signal, resend it to ourselves
         * now that we have restored the signal handlers.
         */

-       if (signo) {
-               kill(getpid(), signo); 
-               switch (signo) {
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       signo = 0;
-                       goto restart;
+       for (i = 0; i < NSIG; i++) {
+               if (signo[i]) {
+                       kill(getpid(), i);
+                       switch (i) {
+                       case SIGTSTP:
+                       case SIGTTIN:
+                       case SIGTTOU:
+                               need_restart = 1;
+                       }

                }
        }
                }
        }

+       if (need_restart)
+               goto restart;

 
 

-       errno = save_errno;
+       if (save_errno)
+               errno = save_errno;

        return(nr == -1 ? NULL : buf);
 }
 
 char *
 getpass(const char *prompt)
 {
        return(nr == -1 ? NULL : buf);
 }
 
 char *
 getpass(const char *prompt)
 {

-       static char buf[_PASSWORD_LEN + 1];
+       const size_t bufsiz = _PASSWORD_LEN + 1;
+       static char *buf = NULL;

 
 

-       if (readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF) == NULL)
+       if (buf == NULL) {
+               buf = malloc(bufsiz);
+               if (buf == NULL) {
+                       return NULL;
+               }
+       }
+
+       if (readpassphrase(prompt, buf, bufsiz, RPP_ECHO_OFF) == NULL) {

                buf[0] = '\0';
                buf[0] = '\0';

-       return(buf);
+       }
+       return buf;

 }
 
 static void handler(int s)
 {
 }
 
 static void handler(int s)
 {

-
-       signo = s;
+       signo[s] = 1;

 }
 }