extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-28 19:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update readpassphrase

Browse Source
This commit is contained in:
Valient Gough 2017-10-12 23:46:02 -07:00
parent dd7edb2942
commit 279c04c53e
No known key found for this signature in database
GPG Key ID: 33C65E29813C14DF
2 changed files with 136 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
encfs/readpassphrase.cpp
View File

@ -1,59 +1,47 @@
/* $OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $ /* $OpenBSD: readpassphrase.c,v 1.26 2016/10/18 12:47:18 millert Exp $
*/ */
/* /*
* Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2000-2002, 2007, 2010
* All rights reserved. * Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Redistribution and use in source and binary forms, with or without * Permission to use, copy, modify, and distribute this software for any
* modification, are permitted provided that the following conditions * purpose with or without fee is hereby granted, provided that the above
* are met: * copyright notice and this permission notice appear in all copies.
* 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, * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR *
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * Sponsored in part by the Defense Advanced Research Projects
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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) /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
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 "includes.h" // #include "includes.h"
#include "readpassphrase.h"
#ifndef HAVE_READPASSPHRASE #ifndef HAVE_READPASSPHRASE
#include "readpassphrase.h" #include <ctype.h>
#include <errno.h>
#include <cctype>
#include <cerrno>
#include <csignal>
#include <cstdio>
#include <cstring>
#include <fcntl.h> #include <fcntl.h>
// #include <readpassphrase.h>
#include <paths.h> #include <paths.h>
#include <sys/types.h> #include <signal.h>
#include <string.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#ifdef TCSASOFT #ifndef TCSASOFT
#define _T_FLUSH (TCSAFLUSH | TCSASOFT) /* If we don't have TCSASOFT define it so that ORing it it below is a no-op. */
#else #define TCSASOFT 0
#define _T_FLUSH (TCSAFLUSH)
#endif #endif
/* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */ /* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */
@ -61,131 +49,147 @@ static const char rcsid[] =
#define _POSIX_VDISABLE VDISABLE #define _POSIX_VDISABLE VDISABLE
#endif #endif
static volatile sig_atomic_t signo; #ifndef _NSIG
#ifdef NSIG
#define _NSIG NSIG
#else
#define _NSIG 128
#endif
#endif
static volatile sig_atomic_t signo[_NSIG];
static void handler(int); static void handler(int);
char *readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags) { char *readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags) {
ssize_t nr; ssize_t nr;
int input, output, save_errno; int input, output, save_errno, i, need_restart;
char ch, *p, *end; char ch, *p, *end;
struct termios term, oterm; struct termios term, oterm;
struct sigaction sa, saveint, savehup, savequit, saveterm; struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
struct sigaction savetstp, savettin, savettou; struct sigaction savetstp, savettin, savettou, savepipe;
/* I suppose we could alloc on demand in this case (XXX). */ /* I suppose we could alloc on demand in this case (XXX). */
if (bufsiz == 0) { if (bufsiz == 0) {
errno = EINVAL; errno = EINVAL;
return (nullptr); return nullptr;
} }
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 * Read and write to /dev/tty if available. If not, read from
* stdin and write to stderr unless a tty is required. * stdin and write to stderr unless a tty is required.
*/ */
if ((input = output = open(_PATH_TTY, O_RDWR)) == -1) { if ((flags & RPP_STDIN) || (input = output = open(_PATH_TTY, O_RDWR)) == -1) {
if ((flags & RPP_REQUIRE_TTY) != 0) { if (flags & RPP_REQUIRE_TTY) {
errno = ENOTTY; errno = ENOTTY;
return (nullptr); return nullptr;
} }
input = STDIN_FILENO; input = STDIN_FILENO;
output = STDERR_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 != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
memcpy(&term, &oterm, sizeof(term));
if (!(flags & RPP_ECHO_ON)) term.c_lflag &= ~(ECHO | ECHONL);
#ifdef VSTATUS
if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
term.c_cc[VSTATUS] = _POSIX_VDISABLE;
#endif
(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 * Catch signals that would otherwise cause the user to end
* up with echo turned off in the shell. Don't worry about * 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); sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; /* don't restart system calls */ sa.sa_flags = 0; /* don't restart system calls */
sa.sa_handler = handler; 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(SIGQUIT, &sa, &savequit);
(void)sigaction(SIGTERM, &sa, &saveterm); (void)sigaction(SIGTERM, &sa, &saveterm);
(void)sigaction(SIGTSTP, &sa, &savetstp); (void)sigaction(SIGTSTP, &sa, &savetstp);
(void)sigaction(SIGTTIN, &sa, &savettin); (void)sigaction(SIGTTIN, &sa, &savettin);
(void)sigaction(SIGTTOU, &sa, &savettou); (void)sigaction(SIGTTOU, &sa, &savettou);
/* Turn off echo if possible. */ if (!(flags & RPP_STDIN)) (void)write(output, prompt, strlen(prompt));
if (tcgetattr(input, &oterm) == 0) { end = buf + bufsiz - 1;
memcpy(&term, &oterm, sizeof(term)); p = buf;
if ((flags & RPP_ECHO_ON) == 0) { while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
term.c_lflag &= ~(ECHO | ECHONL); if (p < end) {
} if ((flags & RPP_SEVENBIT)) ch &= 0x7f;
#ifdef VSTATUS if (isalpha((unsigned char)ch)) {
if (term.c_cc[VSTATUS] != _POSIX_VDISABLE) if ((flags & RPP_FORCELOWER)) ch = (char)tolower((unsigned char)ch);
term.c_cc[VSTATUS] = _POSIX_VDISABLE; if ((flags & RPP_FORCEUPPER)) ch = (char)toupper((unsigned char)ch);
#endif
(void)tcsetattr(input, _T_FLUSH, &term);
} else {
memset(&term, 0, sizeof(term));
memset(&oterm, 0, sizeof(oterm));
}
if (write(output, prompt, strlen(prompt)) != -1) {
end = buf + bufsiz - 1;
for (p = buf; (nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r';) {
if (p < end) {
if ((flags & RPP_SEVENBIT) != 0) {
ch &= 0x7f;
}
if (isalpha(ch) != 0) {
if ((flags & RPP_FORCELOWER) != 0) {
ch = tolower(ch);
}
if ((flags & RPP_FORCEUPPER) != 0) {
ch = toupper(ch);
}
}
*p++ = ch;
} }
*p++ = ch;
} }
*p = '\0';
} }
*p = '\0';
save_errno = errno; save_errno = errno;
if ((term.c_lflag & ECHO) == 0u) { if (!(term.c_lflag & ECHO)) (void)write(output, "\n", 1);
if(write(output, "\n", 1) != -1) {
//dummy test to get rid of warn_unused_result compilation warning
}
}
/* Restore old terminal settings and signals. */ /* Restore old terminal settings and signals. */
if (memcmp(&term, &oterm, sizeof(term)) != 0) { if (memcmp(&term, &oterm, sizeof(term)) != 0) {
(void)tcsetattr(input, _T_FLUSH, &oterm); const int sigttou = signo[SIGTTOU];
}
(void)sigaction(SIGINT, &saveint, nullptr); /* Ignore SIGTTOU generated when we are not the fg pgrp. */
(void)sigaction(SIGHUP, &savehup, nullptr); while (tcsetattr(input, TCSAFLUSH | TCSASOFT, &oterm) == -1 &&
(void)sigaction(SIGQUIT, &savequit, nullptr); errno == EINTR && !signo[SIGTTOU])
(void)sigaction(SIGTERM, &saveterm, nullptr); continue;
(void)sigaction(SIGTSTP, &savetstp, nullptr); signo[SIGTTOU] = sigttou;
(void)sigaction(SIGTTIN, &savettin, nullptr);
(void)sigaction(SIGTTOU, &savettou, nullptr);
if (input != STDIN_FILENO) {
(void)close(input);
} }
(void)sigaction(SIGALRM, &savealrm, NULL);
(void)sigaction(SIGHUP, &savehup, NULL);
(void)sigaction(SIGINT, &saveint, 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);
if (input != STDIN_FILENO) (void)close(input);
/* /*
* If we were interrupted by a signal, resend it to ourselves * If we were interrupted by a signal, resend it to ourselves
* now that we have restored the signal handlers. * now that we have restored the signal handlers.
*/ */
if (signo != 0) { for (i = 0; i < _NSIG; i++) {
kill(getpid(), signo); if (signo[i]) {
switch (signo) { kill(getpid(), i);
case SIGTSTP: switch (i) {
case SIGTTIN: case SIGTSTP:
case SIGTTOU: case SIGTTIN:
signo = 0; case SIGTTOU:
goto restart; need_restart = 1;
}
} }
} }
if (need_restart) goto restart;
errno = save_errno; if (save_errno) errno = save_errno;
return (nr == -1 ? nullptr : buf); return (nr == -1 ? NULL : buf);
} }
#endif /* HAVE_READPASSPHRASE */ // DEF_WEAK(readpassphrase);
#if 0 #if 0
char * char *
@ -197,4 +201,5 @@ getpass(const char *prompt)
} }
#endif #endif
static void handler(int s) { signo = s; } static void handler(int s) { signo[s] = 1; }
#endif /* HAVE_READPASSPHRASE */

44
encfs/readpassphrase.h
View File

@ -1,37 +1,32 @@
/* $OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $ /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $
*/ */
/* /*
* Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Permission to use, copy, modify, and distribute this software for any
* modification, are permitted provided that the following conditions * purpose with or without fee is hereby granted, provided that the above
* are met: * copyright notice and this permission notice appear in all copies.
* 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, * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR *
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * Sponsored in part by the Defense Advanced Research Projects
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/ */
/* OPENBSD ORIGINAL: include/readpassphrase.h */
#ifndef _READPASSPHRASE_H_ #ifndef _READPASSPHRASE_H_
#define _READPASSPHRASE_H_ #define _READPASSPHRASE_H_
//#include "includes.h" // #include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#ifndef HAVE_READPASSPHRASE #ifndef HAVE_READPASSPHRASE
@ -42,6 +37,7 @@
#define RPP_FORCELOWER 0x04 /* Force input to lower case. */ #define RPP_FORCELOWER 0x04 /* Force input to lower case. */
#define RPP_FORCEUPPER 0x08 /* Force input to upper case. */ #define RPP_FORCEUPPER 0x08 /* Force input to upper case. */
#define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */
#define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"