CVS commit: pkgsrc/security/netpgpverify/files

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

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.

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 <sys/types.h>