From b90416b7df65a0d8e36c5e6887e33ebd8b25125c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 27 Jun 2001 23:26:38 +1000 Subject: [PATCH] - (djm) Sync with -current openbsd-compat/readpassphrase.c: - djm@cvs.openbsd.org 2001/06/27 13:23:30 typo, spotted by Tom Holroyd ; ok deraadt@ --- ChangeLog | 5 ++++- openbsd-compat/readpassphrase.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56297813d..052948ef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ - (djm) Rename sysconfdir/primes => sysconfdir/moduli - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename 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 ; ok deraadt@ 20010625 - OpenBSD CVS Sync @@ -5800,4 +5803,4 @@ - Wrote replacements for strlcpy and mkdtemp - 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 $ 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 @@ */ #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 */ #include "includes.h" @@ -113,7 +113,7 @@ readpassphrase(prompt, buf, bufsiz, flags) for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) { if (p < end) { if ((flags & RPP_SEVENBIT)) - ch = ch &= 0x7f; + ch &= 0x7f; if (isalpha(ch)) { if ((flags & RPP_FORCELOWER)) ch = tolower(ch);