Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id DD7EB7A478 for ; Fri, 8 Jul 2016 16:21:11 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 903C185EB6; Fri, 8 Jul 2016 16:21:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 20F6E85E74 for ; Fri, 8 Jul 2016 16:21:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id dBLZWH845c4F for ; Fri, 8 Jul 2016 16:21:10 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A6A0784C6C for ; Fri, 8 Jul 2016 16:21:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9D429FBB5; Fri, 8 Jul 2016 16:21:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1467994870282600" MIME-Version: 1.0 Date: Fri, 8 Jul 2016 16:21:10 +0000 From: "Alistair G. Crooks" Subject: CVS commit: pkgsrc/security/netpgpverify/files To: pkgsrc-changes@NetBSD.org Reply-To: agc@netbsd.org X-Mailer: log_accum Message-Id: <20160708162110.9D429FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1467994870282600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: agc Date: Fri Jul 8 16:21:10 UTC 2016 Modified Files: pkgsrc/security/netpgpverify/files: libverify.c verify.h Log Message: Update netpgpverify and libnetpgpverify to 20160706 + 20160705 introduced a bug whereby a key subid would match and verify fine, but, if formatted, would not display the correct subkey information. Fix to show the correct information in this case. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/netpgpverify/files/libverify.c cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/netpgpverify/files/verify.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1467994870282600 Content-Disposition: inline Content-Length: 1349 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/netpgpverify/files/libverify.c diff -u pkgsrc/security/netpgpverify/files/libverify.c:1.21 pkgsrc/security/netpgpverify/files/libverify.c:1.22 --- pkgsrc/security/netpgpverify/files/libverify.c:1.21 Fri Jul 8 15:56:46 2016 +++ pkgsrc/security/netpgpverify/files/libverify.c Fri Jul 8 16:21:10 2016 @@ -1815,7 +1815,7 @@ fmt_primary(obuf_t *obuf, pgpv_t *pgp, p pubkey = &primary->primary; } else { id = ARRAY_ELEMENT(primary->signed_subkeys, subkey); - pubkey = &ARRAY_ELEMENT(pgp->signed_subkeys, id - 1).subkey; + pubkey = &ARRAY_ELEMENT(pgp->signed_subkeys, id).subkey; } if (!fmt_pubkey(obuf, pubkey, "signature ")) { return 0; Index: pkgsrc/security/netpgpverify/files/verify.h diff -u pkgsrc/security/netpgpverify/files/verify.h:1.31 pkgsrc/security/netpgpverify/files/verify.h:1.32 --- pkgsrc/security/netpgpverify/files/verify.h:1.31 Fri Jul 8 15:56:46 2016 +++ pkgsrc/security/netpgpverify/files/verify.h Fri Jul 8 16:21:10 2016 @@ -23,9 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef NETPGP_VERIFY_H_ -#define NETPGP_VERIFY_H_ 20160705 +#define NETPGP_VERIFY_H_ 20160706 -#define NETPGPVERIFY_VERSION "netpgpverify portable 20160705" +#define NETPGPVERIFY_VERSION "netpgpverify portable 20160706" #include --_----------=_1467994870282600--