Mon Feb 20 01:33:28 2017 UTC ()

Remove a useless loop around getpass()

According to getpass(3), this library function cannot return NULL.
Verified with a source code inspection.


(khorben)

diff -r1.49 -r1.50 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c

--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c 2012/03/05 02:20:18	1.49
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c 2017/02/20 01:33:28	1.50

 @@ -44,27 +44,27 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 #include "config.h"
 #ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.49 2012/03/05 02:20:18 christos Exp $");
+__RCSID("$NetBSD: reader.c,v 1.50 2017/02/20 01:33:28 khorben Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 @@ -152,28 +152,27 @@ read_partial_data(pgp_stream_t *stream,
 		stream->virtualpkt = NULL;
 		stream->virtualc = stream->virtualoff = 0;
+	}
 	return (int)n;
+}
 /* get a pass phrase from the user */
 int
 pgp_getpassphrase(void *in, char *phrase, size_t size)
+{
 	char	*p;
 	if (in == NULL) {
-		while ((p = getpass("netpgp passphrase: ")) == NULL) {
+		p = getpass("netpgp passphrase: ");
 		(void) snprintf(phrase, size, "%s", p);
 	} else {
 		if (fgets(phrase, (int)size, in) == NULL) {
 			return 0;
+		}
 		phrase[strlen(phrase) - 1] = 0x0;
+	}
 	return 1;
+}
 /**
  * \ingroup Internal_Readers_Generic
  * \brief Starts reader stack