Update netpgpverify, and libnetpgpverify, to 20150204

+ dump the huge output in testing script to /dev/null so that we can
see what's happening with the other tests in testit.sh

+ fix from jperkin@, don't try to be clever when selecting the only
key id in a keyring

+ add a test for single key (non-ssh) pubring

6 files changed, 7 insertions, 7 deletions

diff --git a/security/netpgpverify/Makefile b/security/netpgpverify/Makefile
index 18e08520de0..4f475e21de1 100644
--- a/security/netpgpverify/Makefile
+++ b/security/netpgpverify/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2015/01/30 18:47:50 agc Exp $
+# $NetBSD: Makefile,v 1.12 2015/02/03 21:34:57 agc Exp $
 
-DISTNAME=		netpgpverify-20150115
+DISTNAME=		netpgpverify-20150204
 CATEGORIES=		security
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/security/netpgpverify/files/1keypubring.gpg b/security/netpgpverify/files/1keypubring.gpg
new file mode 100644
index 00000000000..806006ebd79
--- /dev/null
+++ b/security/netpgpverify/files/1keypubring.gpg
diff --git a/security/netpgpverify/files/1keysecring.gpg b/security/netpgpverify/files/1keysecring.gpg
new file mode 100644
index 00000000000..e5c48031d66
--- /dev/null
+++ b/security/netpgpverify/files/1keysecring.gpg
diff --git a/security/netpgpverify/files/1keytest.gpg b/security/netpgpverify/files/1keytest.gpg
new file mode 100644
index 00000000000..5bdf2ac7c09
--- /dev/null
+++ b/security/netpgpverify/files/1keytest.gpg
diff --git a/security/netpgpverify/files/Makefile.bsd b/security/netpgpverify/files/Makefile.bsd
index bb1a838e9ee..a17e6c4cd12 100644
--- a/security/netpgpverify/files/Makefile.bsd
+++ b/security/netpgpverify/files/Makefile.bsd
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.5 2015/01/30 18:47:51 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.6 2015/02/03 21:34:57 agc Exp $
 
 PROG=netpgpverify
 
@@ -34,6 +34,8 @@ tst:
 	@echo "expected failure, no valid key for verification"
 	-./${PROG} -k /dev/null NetBSD-6.0_RC1_hashes.gpg
 	@echo "dumping now"
-	./${PROG} -c dump -k pubring.gpg NetBSD-6.0_RC1_hashes.asc
+	./${PROG} -c dump -k pubring.gpg NetBSD-6.0_RC1_hashes.asc > /dev/null
 	@echo "dumping ssh now"
 	./${PROG} -c dump -S sshtest-20140202.pub data.gpg
+	@echo "testing pubring with one key"
+	./${PROG} -k 1keypubring.gpg 1keytest.gpg
diff --git a/security/netpgpverify/files/libverify.c b/security/netpgpverify/files/libverify.c
index ad0293a55be..4e95d6f58ac 100644
--- a/security/netpgpverify/files/libverify.c
+++ b/security/netpgpverify/files/libverify.c
@@ -2697,9 +2697,7 @@ pgpv_verify(pgpv_cursor_t *cursor, pgpv_t *pgp, const void *p, ssize_t size)
 	if (cursor->pgp->ssh) {
 		fixup_ssh_keyid(cursor->pgp, signature, "sha1");
 	}
-	if (ARRAY_COUNT(cursor->pgp->primaries) == 1) {
-		j = 0;
-	} else if ((j = find_keyid(cursor->pgp, NULL, onepass->keyid)) < 0) {
+	if ((j = find_keyid(cursor->pgp, NULL, onepass->keyid)) < 0) {
 		fmt_binary(strkeyid, sizeof(strkeyid), onepass->keyid, (unsigned)sizeof(onepass->keyid));
 		snprintf(cursor->why, sizeof(cursor->why), "Signature key id %s not found ", strkeyid);
 		return 0;