diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/readpassphrase.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -6,6 +6,9 @@ | |||
6 | - (djm) Rename sysconfdir/primes => sysconfdir/moduli | 6 | - (djm) Rename sysconfdir/primes => sysconfdir/moduli |
7 | - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename | 7 | - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename |
8 | existing primes->moduli if it exists. | 8 | existing primes->moduli if it exists. |
9 | - (djm) Sync with -current openbsd-compat/readpassphrase.c: | ||
10 | - djm@cvs.openbsd.org 2001/06/27 13:23:30 | ||
11 | typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@ | ||
9 | 12 | ||
10 | 20010625 | 13 | 20010625 |
11 | - OpenBSD CVS Sync | 14 | - OpenBSD CVS Sync |
@@ -5800,4 +5803,4 @@ | |||
5800 | - Wrote replacements for strlcpy and mkdtemp | 5803 | - Wrote replacements for strlcpy and mkdtemp |
5801 | - Released 1.0pre1 | 5804 | - Released 1.0pre1 |
5802 | 5805 | ||
5803 | $Id: ChangeLog,v 1.1329 2001/06/27 11:52:32 djm Exp $ | 5806 | $Id: ChangeLog,v 1.1330 2001/06/27 13:26:38 djm Exp $ |
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 308e7cc5f..10f0e0ed3 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #if defined(LIBC_SCCS) && !defined(lint) | 28 | #if defined(LIBC_SCCS) && !defined(lint) |
29 | static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.4 2001/06/18 17:41:39 millert Exp $"; | 29 | static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.5 2001/06/27 13:23:30 djm Exp $"; |
30 | #endif /* LIBC_SCCS and not lint */ | 30 | #endif /* LIBC_SCCS and not lint */ |
31 | 31 | ||
32 | #include "includes.h" | 32 | #include "includes.h" |
@@ -113,7 +113,7 @@ readpassphrase(prompt, buf, bufsiz, flags) | |||
113 | for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) { | 113 | for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) { |
114 | if (p < end) { | 114 | if (p < end) { |
115 | if ((flags & RPP_SEVENBIT)) | 115 | if ((flags & RPP_SEVENBIT)) |
116 | ch = ch &= 0x7f; | 116 | ch &= 0x7f; |
117 | if (isalpha(ch)) { | 117 | if (isalpha(ch)) { |
118 | if ((flags & RPP_FORCELOWER)) | 118 | if ((flags & RPP_FORCELOWER)) |
119 | ch = tolower(ch); | 119 | ch = tolower(ch); |