Module Name: src
Committed By: khorben
Date: Fri Feb 24 01:27:14 UTC 2017
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: reader.c
Log Message:
Revert "Remove a useless loop around getpass()"
getpass(3) may return NULL upon failures on Linux, and netpgp should remain
portable to other systems.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.50 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.51
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.50 Mon Feb 20 01:33:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Fri Feb 24 01:27:14 2017
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.50 2017/02/20 01:33:28 khorben Exp $");
+__RCSID("$NetBSD: reader.c,v 1.51 2017/02/24 01:27:14 khorben Exp $");
#endif
#include <sys/types.h>
@@ -162,7 +162,8 @@ pgp_getpassphrase(void *in, char *phrase
char *p;
if (in == NULL) {
- p = getpass("netpgp passphrase: ");
+ while ((p = getpass("netpgp passphrase: ")) == NULL) {
+ }
(void) snprintf(phrase, size, "%s", p);
} else {
if (fgets(phrase, (int)size, in) == NULL) {
