- (djm) Sync with -current openbsd-compat/readpassphrase.c:

- djm@cvs.openbsd.org 2001/06/27 13:23:30
     typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@
This commit is contained in:
Damien Miller 2001-06-27 23:26:38 +10:00
parent b5b0af4d58
commit b90416b7df
2 changed files with 6 additions and 3 deletions

View File

@ -6,6 +6,9 @@
- (djm) Rename sysconfdir/primes => sysconfdir/moduli - (djm) Rename sysconfdir/primes => sysconfdir/moduli
- (djm) Oops, forgot make logic for primes=>moduli. Also try to rename - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename
existing primes->moduli if it exists. existing primes->moduli if it exists.
- (djm) Sync with -current openbsd-compat/readpassphrase.c:
- djm@cvs.openbsd.org 2001/06/27 13:23:30
typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@
20010625 20010625
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5800,4 +5803,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1329 2001/06/27 11:52:32 djm Exp $ $Id: ChangeLog,v 1.1330 2001/06/27 13:26:38 djm Exp $

View File

@ -26,7 +26,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.4 2001/06/18 17:41:39 millert Exp $"; static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.5 2001/06/27 13:23:30 djm Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include "includes.h" #include "includes.h"
@ -113,7 +113,7 @@ readpassphrase(prompt, buf, bufsiz, flags)
for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) { for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) {
if (p < end) { if (p < end) {
if ((flags & RPP_SEVENBIT)) if ((flags & RPP_SEVENBIT))
ch = ch &= 0x7f; ch &= 0x7f;
if (isalpha(ch)) { if (isalpha(ch)) {
if ((flags & RPP_FORCELOWER)) if ((flags & RPP_FORCELOWER))
ch = tolower(ch); ch = tolower(ch);