CVS commit: pkgsrc/security/netpgpverify

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov  1 11:28:35 UTC 2020

Modified Files:
        pkgsrc/security/netpgpverify: Makefile
        pkgsrc/security/netpgpverify/files: Makefile.in libverify.c verify.h

Log Message:
netpgpverify: update to 20201101

Merge:
absorb issuer fingerprint (RFC4880bis 5.2.3.28) in libverify.c
from jhigh from src/

While here, fix build with RELRO and a pkglint warning.

Bump version to 20201101.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/netpgpverify/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/netpgpverify/files/Makefile.in
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/netpgpverify/files/libverify.c
cvs rdiff -u -r1.43 -r1.44 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/Makefile
diff -u pkgsrc/security/netpgpverify/Makefile:1.21 pkgsrc/security/netpgpverify/Makefile:1.22
--- pkgsrc/security/netpgpverify/Makefile:1.21  Sat Jan 18 23:35:10 2020
+++ pkgsrc/security/netpgpverify/Makefile       Sun Nov  1 11:28:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/18 23:35:10 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2020/11/01 11:28:35 wiz Exp $
 
 DISTNAME=              netpgpverify-${VERSION}
 CATEGORIES=            security
@@ -20,6 +20,6 @@ TEST_TARGET=          tst
 VERSION!=      ${AWK} '/\#define.*NETPGP_VERIFY_H_/ {print $$3}' ${FILESDIR}/verify.h
 
 do-extract:
-       @${CP} -R ${FILESDIR} ${WRKSRC}
+       ${CP} -R ${FILESDIR} ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/netpgpverify/files/Makefile.in
diff -u pkgsrc/security/netpgpverify/files/Makefile.in:1.8 pkgsrc/security/netpgpverify/files/Makefile.in:1.9
--- pkgsrc/security/netpgpverify/files/Makefile.in:1.8  Thu Jun 30 21:19:59 2016
+++ pkgsrc/security/netpgpverify/files/Makefile.in      Sun Nov  1 11:28:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.8 2016/06/30 21:19:59 agc Exp $
+# $NetBSD: Makefile.in,v 1.9 2020/11/01 11:28:35 wiz Exp $
 
 PROG=netpgpverify
 
@@ -16,7 +16,7 @@ MANDIR=@MANDIR@
 all: ${PROG}
 
 ${PROG}: ${OBJS}
-       ${CC} ${OBJS} -o ${PROG}
+       ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o ${PROG}
 
 install:
        install -c -s ${PROG} ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/security/netpgpverify/files/libverify.c
diff -u pkgsrc/security/netpgpverify/files/libverify.c:1.30 pkgsrc/security/netpgpverify/files/libverify.c:1.31
--- pkgsrc/security/netpgpverify/files/libverify.c:1.30 Mon May  4 19:13:13 2020
+++ pkgsrc/security/netpgpverify/files/libverify.c      Sun Nov  1 11:28:35 2020
@@ -151,6 +151,8 @@ typedef struct pgpv_signature_t {
        char                    *features;
        char                    *why_revoked;
        uint8_t                 *revoke_fingerprint;
+       uint8_t                 *issuer_fingerprint;
+       uint8_t                  ifver;
        uint8_t                  revoke_alg;
        uint8_t                  revoke_sensitive;
        uint8_t                  trustsig;
@@ -925,6 +927,7 @@ str_to_keyid(const char *s, uint8_t *key
 #define SUBPKT_FEATURES                        30
 #define SUBPKT_SIGNATURE_TARGET                31
 #define SUBPKT_EMBEDDED_SIGNATURE      32
+#define SUBPKT_ISSUER_FINGERPRINT      33
 
 #define UNCOMPRESSED                   0
 #define ZIP_COMPRESSION                        1
@@ -1180,6 +1183,10 @@ read_sig_subpackets(pgpv_t *pgp, pgpv_si
                        sigpkt->sig.revoked = *p++ + 1;
                        sigpkt->sig.why_revoked = (char *)(void *)p;
                        break;
+               case SUBPKT_ISSUER_FINGERPRINT:
+                       sigpkt->sig.ifver = *p;
+                       sigpkt->sig.issuer_fingerprint = &p[1];
+                       break;
                default:
                        printf("Ignoring unusual/reserved signature subpacket %d\n", subpkt.tag);
                        break;

Index: pkgsrc/security/netpgpverify/files/verify.h
diff -u pkgsrc/security/netpgpverify/files/verify.h:1.43 pkgsrc/security/netpgpverify/files/verify.h:1.44
--- pkgsrc/security/netpgpverify/files/verify.h:1.43    Mon May  4 01:39:59 2020
+++ pkgsrc/security/netpgpverify/files/verify.h Sun Nov  1 11:28:35 2020
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_       20200504
+#define NETPGP_VERIFY_H_       20201101
 
-#define NETPGPVERIFY_VERSION   "netpgpverify portable 20200504"
+#define NETPGPVERIFY_VERSION   "netpgpverify portable 20201101"
 
 #include <sys/types.h>