CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Jason High]

Module Name:src
Committed By:   jhigh
Date:   Wed Jul 28 22:31:45 UTC 2021

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: packet-print.c
packet-show.c

Log Message:
print Issuer Fingerprint subpacket 33 (rfc4880bis-08:5.2.3.28) rather than 
Unknown


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.42 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.43
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.42	Wed Feb 22 06:29:40 2012
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c	Wed Jul 28 22:31:45 2021
@@ -58,7 +58,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-print.c,v 1.42 2012/02/22 06:29:40 agc Exp $");
+__RCSID("$NetBSD: packet-print.c,v 1.43 2021/07/28 22:31:45 jhigh Exp $");
 #endif
 
 #include 
@@ -1090,6 +1090,14 @@ pgp_print_packet(pgp_printstate_t *print
 		end_subpacket(>indent);
 		break;
 
+	case PGP_PTAG_SS_ISSUER_FINGERPRINT:
+		start_subpacket(>indent, pkt->tag);
+		print_hexdump(print->indent, "Issuer Fingerprint",
+			  content->ss_issuer_fingerprint.fingerprint, 
+			  content->ss_issuer_fingerprint.len);
+		end_subpacket(>indent);
+		break;
+
 	case PGP_PTAG_SS_PREFERRED_SKA:
 		start_subpacket(>indent, pkt->tag);
 		print_data(print->indent, "Preferred Symmetric Algorithms",

Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.21 src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.22
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.21	Sun Aug 14 11:19:51 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c	Wed Jul 28 22:31:45 2021
@@ -60,7 +60,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-show.c,v 1.21 2011/08/14 11:19:51 christos Exp $");
+__RCSID("$NetBSD: packet-show.c,v 1.22 2021/07/28 22:31:45 jhigh Exp $");
 #endif
 
 #include 
@@ -115,6 +115,7 @@ static pgp_map_t packet_tag_map[] =
 	{PGP_PTAG_SS_PREFERRED_SKA, "SS: Preferred Secret Key Algorithm"},
 	{PGP_PTAG_SS_REVOCATION_KEY, "SS: Revocation Key"},
 	{PGP_PTAG_SS_ISSUER_KEY_ID, "SS: Issuer Key Id"},
+	{PGP_PTAG_SS_ISSUER_FINGERPRINT, "SS: Issuer Fingerprint"},
 	{PGP_PTAG_SS_NOTATION_DATA, "SS: Notation Data"},
 	{PGP_PTAG_SS_PREFERRED_HASH, "SS: Preferred Hash Algorithm"},
 	{PGP_PTAG_SS_PREF_COMPRESS, "SS: Preferred Compression Algorithm"},
@@ -164,6 +165,7 @@ static pgp_map_t ss_type_map[] =
 	{PGP_PTAG_SS_PREFERRED_SKA, "Preferred Symmetric Algorithms"},
 	{PGP_PTAG_SS_REVOCATION_KEY, "Revocation Key"},
 	{PGP_PTAG_SS_ISSUER_KEY_ID, "Issuer key ID"},
+	{PGP_PTAG_SS_ISSUER_FINGERPRINT, "Issuer Fingerprint"},
 	{PGP_PTAG_SS_NOTATION_DATA, "Notation Data"},
 	{PGP_PTAG_SS_PREFERRED_HASH, "Preferred Hash Algorithms"},
 	{PGP_PTAG_SS_PREF_COMPRESS, "Preferred Compression Algorithms"},

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Nov  1 11:29:17 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in
bzlib_private.h libverify.c verify.h
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: HOWTO
dash-escaped-text dash-escaped-text.asc netpgpv-bzlib.h verify.map
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib.h

Log Message:
Sync with netpgpverify-20201101 from pkgsrc (the master for this).

No effective change except for version bump.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/dash-escaped-text \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/dash-escaped-text.asc \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpv-bzlib.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.map
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.11	Mon Apr 17 19:50:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in	Sun Nov  1 11:29:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.11 2017/04/17 19:50:28 agc Exp $
+# $NetBSD: Makefile.in,v 1.12 2020/11/01 11:29:17 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: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.11	Mon May  4 00:18:34 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Sun Nov  1 11:29:17 2020
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_	20200503
+#define NETPGP_VERIFY_H_	20201101
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20200503"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20201101"
 
 #include 
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.4	Mon May  4 00:18:34 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h	Sun Nov  1 11:29:17 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib_private.h,v 1.4 2020/05/04 00:18:34 agc Exp $	*/
+/*	$NetBSD: bzlib_private.h,v 1.5 2020/11/01 11:29:17 wiz Exp $	*/
 
 
 /*-*/
@@ -32,7 +32,7 @@
 #include 
 #endif
 
-#include "bzlib.h"
+#include "netpgpv-bzlib.h"
 
 
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.16 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.17
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.16	Sat Oct 17 23:08:57 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Sun Nov  1 11:29:17 2020
@@ -40,7 +40,7 @@
 #include 
 #include 
 
-#include "bzlib.h"
+#include "netpgpv-bzlib.h"
 #include "zlib.h"
 
 #include "array.h"

Added files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO:1.1
--- /dev/null	Sun Nov  1 11:29:17 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO	Sun Nov  1 11:29:17 2020
@@ -0,0 +1,55 @@
+How to use ssh keys in PGP signatures
+=
+
+1. generate a new ssh key pair
+
+	% ssh-keygen -t rsa -b 4096 -f sshtest-20140202
+	Generating public/private rsa key pair.
+	Enter passphrase (empty for no passphrase):
+	Enter same passphrase again:
+	

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Jason High]

Module Name:src
Committed By:   jhigh
Date:   Sat Oct 17 23:08:57 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
absorb issuer fingerprint (RFC4880bis 5.2.3.28) in libverify.c


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.16
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.15	Mon May  4 00:18:34 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Sat Oct 17 23:08:57 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 = [1];
+			break;
 		default:
 			printf("Ignoring unusual/reserved signature subpacket %d\n", subpkt.tag);
 			break;

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Jason High]

Module Name:src
Committed By:   jhigh
Date:   Wed Oct 14 05:19:41 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c packet-parse.c
packet.h

Log Message:
allow netpgp to absorb gpg2 subpkt 33 for list/enc/decrypt rsa keys


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.52 -r1.53 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.56 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.57
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.56	Tue Nov 13 14:52:30 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Wed Oct 14 05:19:41 2020
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.56 2018/11/13 14:52:30 mlelstv Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.57 2020/10/14 05:19:41 jhigh Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -620,8 +620,12 @@ cb_keyring_read(const pgp_packet_t *pkt,
 		key->subsigc += 1;
 		break;
 	case PGP_PTAG_CT_TRUST:
-		key->subsigs[key->subsigc - 1].trustlevel = pkt->u.ss_trust.level;
-		key->subsigs[key->subsigc - 1].trustamount = pkt->u.ss_trust.amount;
+		EXPAND_ARRAY(key, subsig);
+		key->subsigs[key->subsigc].trustlevel = pkt->u.ss_trust.level;
+		key->subsigs[key->subsigc].trustamount = pkt->u.ss_trust.amount;
+
+		key->subsigc += 1;
+
 		break;
 	case PGP_PTAG_SS_KEY_EXPIRY:
 		EXPAND_ARRAY(keyring, key);
@@ -667,7 +671,6 @@ cb_keyring_read(const pgp_packet_t *pkt,
 	default:
 		break;
 	}
-
 	return PGP_RELEASE_MEMORY;
 }
 

Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.52 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.53
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.52	Tue Nov 13 14:52:30 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c	Wed Oct 14 05:19:41 2020
@@ -58,7 +58,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-parse.c,v 1.52 2018/11/13 14:52:30 mlelstv Exp $");
+__RCSID("$NetBSD: packet-parse.c,v 1.53 2020/10/14 05:19:41 jhigh Exp $");
 #endif
 
 #include 
@@ -984,6 +984,7 @@ pgp_parser_content_free(pgp_packet_t *c)
 	case PGP_PTAG_SS_PRIMARY_USER_ID:
 	case PGP_PTAG_SS_REVOCABLE:
 	case PGP_PTAG_SS_REVOCATION_KEY:
+	case PGP_PTAG_SS_ISSUER_FINGERPRINT:
 	case PGP_PTAG_CT_LITDATA_HEADER:
 	case PGP_PTAG_CT_LITDATA_BODY:
 	case PGP_PTAG_CT_SIGNED_CLEARTEXT_BODY:
@@ -1554,6 +1555,7 @@ parse_one_sig_subpacket(pgp_sig_t *sig,
 	pgp_packet_t	pkt;
 	uint8_t		bools = 0x0;
 	uint8_t		c = 0x0;
+	uint8_t		temp = 0x0;
 	unsigned	doread = 1;
 	unsignedt8;
 	unsignedt7;
@@ -1764,6 +1766,26 @@ parse_one_sig_subpacket(pgp_sig_t *sig,
 		}
 		break;
 
+	case PGP_PTAG_SS_ISSUER_FINGERPRINT:
+		/* octet 0: version */
+		/* 	0x04:20 bytes, 0x05:32 bytes */
+		if (!limread(, 1, , stream)) {
+			return 0;
+		}
+
+		switch (temp) {
+			case 0x04: pkt.u.ss_issuer_fingerprint.len = 20; break;
+			case 0x05: pkt.u.ss_issuer_fingerprint.len = 32; break;
+			default:
+return 0;
+		}
+
+		if (!limread(pkt.u.ss_issuer_fingerprint.fingerprint, 
+			pkt.u.ss_issuer_fingerprint.len, , stream)) {
+			return 0;
+		}
+		break;
+
 	case PGP_PTAG_SS_REVOCATION_KEY:
 		/* octet 0 = class. Bit 0x80 must be set */
 		if (!limread(_revocation_key.class, 1,

Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.31 src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.32
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.31	Tue Nov 13 14:52:30 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet.h	Wed Oct 14 05:19:41 2020
@@ -251,7 +251,7 @@ typedef enum {
 	PGP_PTAG_SS_FEATURES = 0x200 + 30,	/* features */
 	PGP_PTAG_SS_SIGNATURE_TARGET = 0x200 + 31,	/* signature target */
 	PGP_PTAG_SS_EMBEDDED_SIGNATURE = 0x200 + 32,	/* embedded signature */
-
+	PGP_PTAG_SS_ISSUER_FINGERPRINT = 0x200 + 33,	/* issuer fingerprint */
 	PGP_PTAG_SS_USERDEFINED00 = 0x200 + 100,	/* internal or
 			 * user-defined */
 	PGP_PTAG_SS_USERDEFINED01 = 0x200 + 101,
@@ -659,6 +659,11 @@ typedef struct pgp_ss_trust_t {
 	uint8_t			 amount;	/* Amount */
 } pgp_ss_trust_t;
 
+typedef struct pgp_ss_issuer_fingerprint {
+	uint8_t			len; /* 20 or 32 */
+	uint8_t			fingerprint[32]; /* max 32 */
+} pgp_ss_issuer_fingerprint;
+
 /** Signature Subpacket : 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Mon May  4 00:18:34 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
b64.c b64.h bignum.c bn.h bzlib.c bzlib.h bzlib_private.h
libverify.c rsa.c rsa.h verify.h zlib.c zlib.h

Log Message:
Bring over changes from source of truth in pkgsrc - bump version to 20200503

Update netpgpverify and libnetpgpverify to version 20200503

ensure all exported functions use a unique prfix, so that they don't
conflict with symbols (both data and text) in libcrypto. this works for
statically linked binaries and libraries, rather then the version map 
which
only works for dynalically-linked.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.h
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bignum.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bn.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.7 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.8
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.7	Mon Apr 17 19:50:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Mon May  4 00:18:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.7 2017/04/17 19:50:28 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.8 2020/05/04 00:18:34 agc Exp $
 
 PROG=netpgpverify
 
@@ -12,6 +12,11 @@ SRCS+= md5c.c rmd160.c sha1.c sha2.c
 
 CPPFLAGS+=-I.
 
+CPPFLAGS.bzlib.c+=	-Wno-error=implicit-fallthrough
+CPPFLAGS.zlib.c+=	-Wno-error=implicit-fallthrough
+
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/verify.map
+
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0
 LDFLAGS+=-g -O0

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c	Mon May  4 00:18:34 2020
@@ -235,7 +235,7 @@ encodeblock(uint8_t *wordin, uint8_t *wo
 ** base64 encode a stream adding padding and line breaks as per spec.
 */
 int 
-b64encode(const char *in, const size_t insize, void *vp, size_t outsize, int linesize)
+netpgpv_b64encode(const char *in, const size_t insize, void *vp, size_t outsize, int linesize)
 {
 	const char	*inp;
 	unsigned	 i;
@@ -299,7 +299,7 @@ decodeblock(uint8_t wordin[4], uint8_t w
 ** decode a base64 encoded stream discarding padding, line breaks and noise
 */
 int
-b64decode(const char *in, const size_t insize, void *vp, size_t outsize)
+netpgpv_b64decode(const char *in, const size_t insize, void *vp, size_t outsize)
 {
 	const char	*inp;
 	unsigned	 wordlen;
@@ -349,7 +349,7 @@ b64decode(const char *in, const size_t i
 
 /* return the encoded size for n bytes input */
 int
-b64_encsize(unsigned n)
+netpgpv_b64_encsize(unsigned n)
 {
 	return ((4 * n) / 3) + 4;
 }
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h	Mon May  4 00:18:34 2020
@@ -25,8 +25,8 @@
 #ifndef B64_H_
 #define B64_H_	20091223
 
-int b64encode(const char */*in*/, const size_t /*insize*/, void */*vp*/, size_t /*outsize*/, int /*linesize*/);
-int b64decode(const char */*in*/, const size_t /*insize*/, void */*vp*/, size_t /*outsize*/);
-int b64_encsize(unsigned /*n*/);
+int netpgpv_b64encode(const char */*in*/, const size_t /*insize*/, void */*vp*/, 

CVS commit: src/crypto/external/bsd/netpgp/lib/verify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May  3 21:46:37 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/lib/verify: Makefile
Added Files:
src/crypto/external/bsd/netpgp/lib/verify: verify.map

Log Message:
Add a linker map to hide all the symbols the this library accidentally
exported. In particular the following symbols:

DSA_SIG_free
DSA_SIG_new
DSA_do_sign
DSA_do_verify
DSA_free
DSA_new
DSA_size
RSA_check_key
RSA_free
RSA_generate_key
RSA_new
RSA_private_decrypt
RSA_private_encrypt
RSA_public_decrypt
RSA_public_encrypt

conflict with libcrypto and break pkg_add which links against both
libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/lib/verify/verify.map

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.12 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.13
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.12	Sun Oct 13 03:28:05 2019
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile	Sun May  3 17:46:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:05 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/03 21:46:37 christos Exp $
 
 LIB=netpgpverify
 SRCS+=b64.c
@@ -30,4 +30,6 @@ INCSDIR=/usr/include/netpgp
 COPTS+=			${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
 COPTS.libverify.c+=	${GCC_NO_FORMAT_TRUNCATION}
 
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/verify.map
+
 .include 

Added files:

Index: src/crypto/external/bsd/netpgp/lib/verify/verify.map
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/verify/verify.map:1.1
--- /dev/null	Sun May  3 17:46:37 2020
+++ src/crypto/external/bsd/netpgp/lib/verify/verify.map	Sun May  3 17:46:37 2020
@@ -0,0 +1,17 @@
+NETPGPVERIFY_5_0 {
+global:
+	pgpv_new;
+	pgpv_new_cursor;
+	pgpv_read_pubring;
+	pgpv_read_ssh_pubkeys;
+	pgpv_verify;
+	pgpv_get_verified;
+	pgpv_dump;
+	pgpv_get_entry;
+	pgpv_get_cursor_num;
+	pgpv_get_cursor_str;
+	pgpv_get_cursor_element;
+	pgpv_close;
+	pgpv_cursor_close;
+local: *;
+};

CVS commit: src/crypto/external/bsd/netpgp/dist

[Jason High]

Module Name:src
Committed By:   jhigh
Date:   Sat Apr 18 19:27:49 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/dist: configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: config.h.in misc.c
symmetric.c

Log Message:
added blowfish symmetric cipher per RFC4880 9.2


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/configure.ac
diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.42 src/crypto/external/bsd/netpgp/dist/configure.ac:1.43
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.42	Sun Mar  9 00:33:50 2014
+++ src/crypto/external/bsd/netpgp/dist/configure.ac	Sat Apr 18 19:27:49 2020
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.42 2014/03/09 00:33:50 agc Exp $
+# $NetBSD: configure.ac,v 1.43 2020/04/18 19:27:49 jhigh Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
 AC_INIT([netpgp],[20140220],[Alistair Crooks  c0596823])
 AC_PREREQ(2.69)
-AC_REVISION([$Revision: 1.42 $])
+AC_REVISION([$Revision: 1.43 $])
 
 AS_SHELL_SANITIZE
 
@@ -60,7 +60,7 @@ AC_CHECK_HEADERS([dmalloc.h direct.h err
 AC_CHECK_HEADERS([openssl/aes.h openssl/bn.h openssl/camellia.h openssl/cast.h \
 		  openssl/des.h openssl/dsa.h openssl/err.h openssl/idea.h \
 		  openssl/md5.h openssl/rand.h openssl/rsa.h openssl/sha.h \
-		  openssl/err.h openssl/sha.h])
+		  openssl/err.h openssl/sha.h openssl/blowfish.h])
 AC_CHECK_HEADERS([sys/cdefs.h sys/file.h sys/mman.h sys/param.h \
   sys/resource.h sys/uio.h])
 

Index: src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.18
--- src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.17	Mon Feb 17 06:38:07 2014
+++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in	Sat Apr 18 19:27:48 2020
@@ -39,6 +39,9 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_OPENSSL_AES_H
 
+/* Define to 1 if you have the  header file. */
+#undef HAVE_OPENSSL_BLOWFISH_H
+
 /* Define to 1 if you have the  header file. */
 #undef HAVE_OPENSSL_BN_H
 
@@ -120,8 +123,7 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_ZLIB_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Name of package */

Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.42 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.43
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.42	Tue Nov 13 14:52:30 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c	Sat Apr 18 19:27:48 2020
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: misc.c,v 1.42 2018/11/13 14:52:30 mlelstv Exp $");
+__RCSID("$NetBSD: misc.c,v 1.43 2020/04/18 19:27:48 jhigh Exp $");
 #endif
 
 #include 
@@ -816,6 +816,7 @@ static str2cipher_t	str2cipher[] = {
 	{	"idea",			PGP_SA_IDEA		},
 	{	"aes128",		PGP_SA_AES_128		},
 	{	"aes256",		PGP_SA_AES_256		},
+	{	"blowfish",		PGP_SA_BLOWFISH		},
 	{	"camellia128",		PGP_SA_CAMELLIA_128	},
 	{	"camellia256",		PGP_SA_CAMELLIA_256	},
 	{	"tripledes",		PGP_SA_TRIPLEDES	},

Index: src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.18	Sun Nov  7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c	Sat Apr 18 19:27:48 2020
@@ -54,7 +54,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: symmetric.c,v 1.18 2010/11/07 08:39:59 agc Exp $");
+__RCSID("$NetBSD: symmetric.c,v 1.19 2020/04/18 19:27:48 jhigh Exp $");
 #endif
 
 #include "crypto.h"
@@ -82,6 +82,10 @@ __RCSID("$NetBSD: symmetric.c,v 1.18 201
 #include 
 #endif
 
+#ifdef HAVE_OPENSSL_BLOWFISH_H
+#include 
+#endif
+
 #include "crypto.h"
 #include "netpgpdefs.h"
 
@@ -192,6 +196,81 @@ static pgp_crypt_t cast5 =
 	TRAILER
 };
 
+#ifdef HAVE_OPENSSL_BLOWFISH_H
+
+/* RFC 4880 9.2 Blowfish 128 */
+#define BLOWFISH_KEY_LENGTH	16
+
+static int
+blowfish_init(pgp_crypt_t *crypt)
+{
+if (crypt->encrypt_key) {
+   

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Jason High]

Module Name:src
Committed By:   jhigh
Date:   Sat Mar 21 01:07:21 UTC 2020

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
cleanly fail initialization on empty keyring


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.102 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.103
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.102	Tue Nov 13 14:52:30 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Sat Mar 21 01:07:21 2020
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.102 2018/11/13 14:52:30 mlelstv Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.103 2020/03/21 01:07:21 jhigh Exp $");
 #endif
 
 #include 
@@ -429,7 +429,7 @@ get_first_ring(pgp_keyring_t *ring, char
 	int	 i;
 	int	 n;
 
-	if (ring == NULL) {
+	if (ring == NULL || ring->keyc == 0) {
 		return 0;
 	}
 	(void) memset(id, 0x0, len);

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Tue Nov 13 14:52:31 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c keyring.h misc.c
netpgp.c packet-parse.c packet.h
src/crypto/external/bsd/netpgp/dist/src/libmj: libmj.3 mj.c
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c

Log Message:
Fix some error handling, json support, keyring handling.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.34 -r1.35 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.101 -r1.102 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.51 -r1.52 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.30 -r1.31 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.55 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.56
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.55	Mon Mar 27 21:19:12 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Tue Nov 13 14:52:30 2018
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.55 2017/03/27 21:19:12 khorben Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.56 2018/11/13 14:52:30 mlelstv Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -456,10 +456,12 @@ copy_packet(pgp_subpacket_t *dst, const 
 	}
 	if ((dst->raw = calloc(1, src->length)) == NULL) {
 		(void) fprintf(stderr, "copy_packet: bad alloc\n");
+		dst->length = 0;
 	} else {
 		dst->length = src->length;
 		(void) memcpy(dst->raw, src->raw, src->length);
 	}
+	dst->tag = src->tag;
 	return dst;
 }
 
@@ -500,7 +502,6 @@ pgp_add_subpacket(pgp_key_t *keydata, co
 	EXPAND_ARRAY(keydata, packet);
 	/* initialise new entry in array */
 	subpktp = >packets[keydata->packetc++];
-	subpktp->length = 0;
 	subpktp->raw = NULL;
 	/* now copy it */
 	return copy_packet(subpktp, packet);
@@ -545,6 +546,7 @@ pgp_add_selfsigned_userid(pgp_key_t *key
 	/* add this packet to key */
 	sigpacket.length = pgp_mem_len(mem_sig);
 	sigpacket.raw = pgp_mem_data(mem_sig);
+	sigpacket.tag = PGP_PTAG_CT_SIGNATURE;
 
 	/* add userid to key */
 	(void) pgp_add_userid(key, userid);
@@ -596,13 +598,14 @@ cb_keyring_read(const pgp_packet_t *pkt,
 
 	cb = pgp_callback_arg(cbinfo);
 	keyring = cb->keyring;
+	key = keyring->keyc > 0 ? >keys[keyring->keyc - 1] : NULL;
+
 	switch (pkt->tag) {
 	case PGP_PARSER_PTAG:
 	case PGP_PTAG_CT_ENCRYPTED_SECRET_KEY:
 		/* we get these because we didn't prompt */
 		break;
 	case PGP_PTAG_CT_SIGNATURE_HEADER:
-		key = >keys[keyring->keyc - 1];
 		EXPAND_ARRAY(key, subsig);
 		key->subsigs[key->subsigc].uid = key->uidc - 1;
 		(void) memcpy(>subsigs[key->subsigc].sig, >u.sig,
@@ -610,7 +613,6 @@ cb_keyring_read(const pgp_packet_t *pkt,
 		key->subsigc += 1;
 		break;
 	case PGP_PTAG_CT_SIGNATURE:
-		key = >keys[keyring->keyc - 1];
 		EXPAND_ARRAY(key, subsig);
 		key->subsigs[key->subsigc].uid = key->uidc - 1;
 		(void) memcpy(>subsigs[key->subsigc].sig, >u.sig,
@@ -618,7 +620,6 @@ cb_keyring_read(const pgp_packet_t *pkt,
 		key->subsigc += 1;
 		break;
 	case PGP_PTAG_CT_TRUST:
-		key = >keys[keyring->keyc - 1];
 		key->subsigs[key->subsigc - 1].trustlevel = pkt->u.ss_trust.level;
 		key->subsigs[key->subsigc - 1].trustamount = pkt->u.ss_trust.amount;
 		break;
@@ -629,28 +630,23 @@ cb_keyring_read(const pgp_packet_t *pkt,
 		}
 		break;
 	case PGP_PTAG_SS_ISSUER_KEY_ID:
-		key = >keys[keyring->keyc - 1];
 		(void) memcpy(>subsigs[key->subsigc - 1].sig.info.signer_id,
 			  pkt->u.ss_issuer,
 			  sizeof(pkt->u.ss_issuer));
 		key->subsigs[key->subsigc - 1].sig.info.signer_id_set = 1;
 		break;
 	case PGP_PTAG_SS_CREATION_TIME:
-		key = >keys[keyring->keyc - 1];
 		key->subsigs[key->subsigc - 1].sig.info.birthtime = pkt->u.ss_time;
 		key->subsigs[key->subsigc - 1].sig.info.birthtime_set = 1;
 		break;
 	case PGP_PTAG_SS_EXPIRATION_TIME:
-		key = >keys[keyring->keyc - 1];
 		key->subsigs[key->subsigc - 1].sig.info.duration = pkt->u.ss_time;
 		key->subsigs[key->subsigc - 1].sig.info.duration_set = 1;
 		break;
 	case PGP_PTAG_SS_PRIMARY_USER_ID:
-		key = >keys[keyring->keyc - 1];
 		key->uid0 = key->uidc - 1;
 		break;
 	case 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Aug 13 09:54:19 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: sha2.c

Log Message:
avoid redefinition


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c:1.3	Wed Jul 25 20:31:13 2018
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c	Mon Aug 13 05:54:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.3 2018/07/26 00:31:13 kamil Exp $ */
+/* $NetBSD: sha2.c,v 1.4 2018/08/13 09:54:19 christos Exp $ */
 /*	$KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $	*/
 
 /*
@@ -48,7 +48,9 @@
 #   undef be32toh
 #   undef be64toh
 
+#ifndef __CAST
 #define __CAST(__dt, __st)  ((__dt)(__st)) /* srsly? */
+#endif
 
 static __inline void
 be32encode(void *buf, uint32_t u)

CVS commit: src/crypto/external/bsd/netpgp/dist/src/libbn

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Aug 13 09:53:51 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libbn: bignum.c

Log Message:
sprinke const


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.5 src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.6
--- src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.5	Mon Mar 18 21:00:16 2013
+++ src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c	Mon Aug 13 05:53:51 2018
@@ -575,7 +575,7 @@ mp_init_size (mp_int * a, int size)
 }
 
 /* creates "a" then copies b into it */
-static int mp_init_copy (mp_int * a, mp_int * b)
+static int mp_init_copy (mp_int * a, const mp_int * b)
 {
   int res;
 
@@ -587,9 +587,9 @@ static int mp_init_copy (mp_int * a, mp_
 
 /* low level addition, based on HAC pp.594, Algorithm 14.7 */
 static int
-s_mp_add (mp_int * a, mp_int * b, mp_int * c)
+s_mp_add (const mp_int * a, const mp_int * b, mp_int * c)
 {
-  mp_int *x;
+  const mp_int *x;
   int olduse, res, min, max;
 
   /* find sizes, we let |a| <= |b| which means we have to sort
@@ -617,7 +617,8 @@ s_mp_add (mp_int * a, mp_int * b, mp_int
   c->used = max + 1;
 
   {
-mp_digit u, *tmpa, *tmpb, *tmpc;
+const mp_digit *tmpa, *tmpb;
+mp_digit u, *tmpc;
 int i;
 
 /* alias for digit pointers */
@@ -675,7 +676,7 @@ s_mp_add (mp_int * a, mp_int * b, mp_int
 
 /* low level subtraction (assumes |a| > |b|), HAC pp.595 Algorithm 14.9 */
 static int
-s_mp_sub (mp_int * a, mp_int * b, mp_int * c)
+s_mp_sub (const mp_int * a, const mp_int * b, mp_int * c)
 {
   int olduse, res, min, max;
 
@@ -693,7 +694,8 @@ s_mp_sub (mp_int * a, mp_int * b, mp_int
   c->used = max;
 
   {
-mp_digit u, *tmpa, *tmpb, *tmpc;
+const mp_digit *tmpa, *tmpb;
+mp_digit u, *tmpc;
 int i;
 
 /* alias for digit pointers */
@@ -742,7 +744,7 @@ s_mp_sub (mp_int * a, mp_int * b, mp_int
 
 /* high level subtraction (handles signs) */
 static int
-mp_sub (mp_int * a, mp_int * b, mp_int * c)
+mp_sub (const mp_int * a, const mp_int * b, mp_int * c)
 {
   int sa, sb, res;
 
@@ -831,9 +833,10 @@ static int mp_rshd (mp_int * a, int b)
 
 /* multiply by a digit */
 static int
-mp_mul_d (mp_int * a, mp_digit b, mp_int * c)
+mp_mul_d (const mp_int * a, mp_digit b, mp_int * c)
 {
-  mp_digit u, *tmpa, *tmpc;
+  const mp_digit *tmpa;
+  mp_digit u, *tmpc;
   mp_word  r;
   int  ix, res, olduse;
 
@@ -888,7 +891,7 @@ mp_mul_d (mp_int * a, mp_digit b, mp_int
 }
 
 /* high level addition (handles signs) */
-static int mp_add (mp_int * a, mp_int * b, mp_int * c)
+static int mp_add (const mp_int * a, const mp_int * b, mp_int * c)
 {
   int sa, sb, res;
 
@@ -933,7 +936,7 @@ mp_exch(mp_int *a, mp_int *b)
 
 /* calc a value mod 2**b */
 static int
-mp_mod_2d (mp_int * a, int b, mp_int * c)
+mp_mod_2d (const mp_int * a, int b, mp_int * c)
 {
   int x, res;
 
@@ -966,7 +969,7 @@ mp_mod_2d (mp_int * a, int b, mp_int * c
 }
 
 /* shift right by a certain bit count (store quotient in c, optional remainder in d) */
-static int mp_div_2d (mp_int * a, int b, mp_int * c, mp_int * d)
+static int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d)
 {
   mp_digit D, r, rr;
   int x, res;
@@ -1055,7 +1058,7 @@ static int mp_div_2d (mp_int * a, int b,
  * 14.20 from HAC but fixed to treat these cases.
 */
 static int
-mp_div(mp_int *c, mp_int *d, mp_int *a, mp_int *b)
+mp_div(mp_int *c, mp_int *d, const mp_int *a, const mp_int *b)
 {
   mp_int  q, x, y, t1, t2;
   int res, n, t, i, norm, neg;
@@ -1240,7 +1243,7 @@ LBL_Q:mp_clear ();
 
 /* c = a mod b, 0 <= c < b */
 static int
-mp_mod (mp_int * a, mp_int * b, mp_int * c)
+mp_mod (const mp_int * a, const mp_int * b, mp_int * c)
 {
   mp_int  t;
   int res;
@@ -1274,7 +1277,7 @@ static void mp_set (mp_int * a, mp_digit
 }
 
 /* b = a/2 */
-static int mp_div_2(mp_int * a, mp_int * b)
+static int mp_div_2(const mp_int * a, mp_int * b)
 {
   int x, res, oldused;
 
@@ -1321,7 +1324,7 @@ static int mp_div_2(mp_int * a, mp_int *
 }
 
 /* compare a digit */
-static int mp_cmp_d(mp_int * a, mp_digit b)
+static int mp_cmp_d(const mp_int * a, mp_digit b)
 {
   /* compare based on sign */
   if (a->sign == MP_NEG) {
@@ -1362,7 +1365,7 @@ static void mp_clear_multi(mp_int *mp, .
  * odd as per HAC Note 14.64 on pp. 610
  */
 static int
-fast_mp_invmod (mp_int * a, mp_int * b, mp_int * c)
+fast_mp_invmod (const mp_int * a, const mp_int * b, mp_int * c)
 {
   mp_int  x, y, u, v, B, D;
   int res, neg;
@@ -1485,7 +1488,7 @@ LBL_ERR:mp_clear_multi (, , , , 
 
 /* hac 14.61, pp608 */
 static int
-mp_invmod_slow (mp_int * a, mp_int * b, 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Jul 26 00:31:13 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: sha2.c

Log Message:
Avoid undefined behavior in netpgpverify/sha2.c

Do not change the signedness bit with a left shift operation.
Cast to unsigned integer to prevent this.

sha2.c:79:16, left shift of 154 by 24 places cannot be represented in type 'int'

Detected with micro-UBSan in the user mode.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c:1.2	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c	Thu Jul 26 00:31:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.2 2016/06/14 20:47:08 agc Exp $ */
+/* $NetBSD: sha2.c,v 1.3 2018/07/26 00:31:13 kamil Exp $ */
 /*	$KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $	*/
 
 /*
@@ -76,7 +76,7 @@ htobe32(uint32_t x)
 	uint8_t p[4];
 	memcpy(p, , 4);
 
-	return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+	return (((uint32_t)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
 }
 
 static uint64_t
@@ -86,8 +86,8 @@ htobe64(uint64_t x)
 	uint32_t u, v;
 	memcpy(p, , 8);
 
-	u = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
-	v = ((p[4] << 24) | (p[5] << 16) | (p[6] << 8) | p[7]);
+	u = (((uint32_t)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+	v = (((uint32_t)p[4] << 24) | (p[5] << 16) | (p[6] << 8) | p[7]);
 
 	return uint64_t)u) << 32) | v);
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Jul 26 00:26:45 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: pgpsum.c

Log Message:
Avoid undefined behavior in netpgpverify

Do not change the signedness bit with a left shift operation.
Cast to unsigned integer to prevent this.

pgpsum.c:187:18, left shift of 130 by 24 places cannot be represented in type 
'int'

Detected with micro-UBSan in the user mode.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c:1.3	Mon Apr 17 19:50:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c	Thu Jul 26 00:26:45 2018
@@ -175,7 +175,7 @@ swap16(uint16_t in)
 	u16	u;
 
 	u.i16 = in;
-	return (u.i8[0] << 8) | u.i8[1];
+	return ((uint16_t)u.i8[0] << 8) | u.i8[1];
 }
 
 static inline uint32_t
@@ -184,7 +184,7 @@ swap32(uint32_t in)
 	u32	u;
 
 	u.i32 = in;
-	return (u.i8[0] << 24) | (u.i8[1] << 16) | (u.i8[2] << 8) | u.i8[3];
+	return ((uint32_t)u.i8[0] << 24) | (u.i8[1] << 16) | (u.i8[2] << 8) | u.i8[3];
 }
 
 static inline int

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu May 10 15:00:36 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Add descriptions for
netpgp_match_keys()
netpgp_match_keys_json()
netpgp_match_pubkeys()
netpgp_validate_sigs()
netpgp_format_json()


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.26 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.27
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.26	Wed May  9 23:34:25 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Thu May 10 15:00:36 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.26 2018/05/09 23:34:25 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.27 2018/05/10 15:00:36 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -233,6 +233,17 @@ function is used.
 To list all the keys in a keyring as a JSON encoded string, the
 .Fn netpgp_list_keys_json
 function is used.
+To find and list keys in a keyring, the
+.Fn netpgp_match_keys
+function is used.
+To find and list keys in a keyring, output as a JSON encoded string,
+the
+.Fn netpgp_match_keys_json
+function is used.
+To find and list keys in a better suited machine-readble format, such as for
+redirection to other parsing engines, the
+.Fn netpgp_match_pubkeys
+function is used.
 The signature subkey fields can also be displayed
 using this function.
 .Pp
@@ -246,6 +257,14 @@ If the subdirectory argument is provided
 is appended to the home directory in order to search for
 the keyrings.
 .Pp
+To print key information from a JSON encoded string, stored in a file, the
+.Fn netpgp_format_json
+function is used.
+.Pp
+To validate the signature of keys in a public key keyring, the
+.Fn netpgp_validate_sigs
+function is used.
+.Pp
 To export a key, the
 .Fn netpgp_export_key
 function is used.

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed May  9 23:34:25 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Add a description of netpgp_unsetvar and netpgp_list_keys_json.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.25 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.26
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.25	Wed May  9 07:59:38 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Wed May  9 23:34:25 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.25 2018/05/09 07:59:38 wiz Exp $
+.\" $NetBSD: libnetpgp.3,v 1.26 2018/05/09 23:34:25 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd May 9, 2018
+.Dd May 10, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -204,6 +204,8 @@ member of the
 structure.
 These are set using the
 .Fn netpgp_setvar
+function and unset using the
+.Fn netpgp_unsetvar
 function.
 If no public key ring file is set, initial values will be taken from those
 in the
@@ -228,6 +230,9 @@ function returns 1 on success, 0 on fail
 To list all the keys in a keyring, the
 .Fn netpgp_list_keys
 function is used.
+To list all the keys in a keyring as a JSON encoded string, the
+.Fn netpgp_list_keys_json
+function is used.
 The signature subkey fields can also be displayed
 using this function.
 .Pp

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed May  9 07:59:38 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Fix typo, add 'and' in list.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.24 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.25
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.24	Wed May  9 00:24:50 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Wed May  9 07:59:38 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.24 2018/05/09 00:24:50 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.25 2018/05/09 07:59:38 wiz Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -342,8 +342,8 @@ At the present time, two types are defin
 .Dq version
 and
 .Dq maintainer .
-The mantainer information returned contains the name, email address, PGP short
-key id.
+The maintainer information returned contains the name, email address,
+and PGP short key id.
 A failure to present a known
 .Ar type
 argument to

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed May  9 00:24:50 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Add the type of information returned about maintainer.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.23 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.24
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.23	Sun Apr 29 14:21:16 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Wed May  9 00:24:50 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.23 2018/04/29 14:21:16 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.24 2018/05/09 00:24:50 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 29, 2018
+.Dd May 9, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -342,6 +342,8 @@ At the present time, two types are defin
 .Dq version
 and
 .Dq maintainer .
+The mantainer information returned contains the name, email address, PGP short
+key id.
 A failure to present a known
 .Ar type
 argument to

CVS commit: src/crypto/external/bsd/netpgp/bindings/lua

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May  3 01:14:54 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/bindings/lua: Makefile

Log Message:
don't build for non pic


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/bindings/lua/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bindings/lua/Makefile
diff -u src/crypto/external/bsd/netpgp/bindings/lua/Makefile:1.1 src/crypto/external/bsd/netpgp/bindings/lua/Makefile:1.2
--- src/crypto/external/bsd/netpgp/bindings/lua/Makefile:1.1	Sun Apr 29 15:47:35 2018
+++ src/crypto/external/bsd/netpgp/bindings/lua/Makefile	Wed May  2 21:14:54 2018
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2018/04/29 19:47:35 sevan Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/03 01:14:54 christos Exp $
 
+.include 
+.if ${MKPIC} != no
 LUA_MODULES=netpgp
 LUA_SRCS.netpgp=glue.c
 LUA_DPLIBS+=netpgp ${.CURDIR}/../../lib/netpgp
@@ -7,5 +9,6 @@ LUA_DPLIBS+=netpgp ${.CURDIR}/../../lib/
 EXTDIST=${.CURDIR}/../../dist
 
 .PATH: ${EXTDIST}/bindings/lua
+.endif
 
 .include 

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Mon Apr 30 22:17:47 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua

Log Message:
The secret key is required for decryption and signing. Indicate it by setting
the "need seckey" variable before calling init.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.5 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.6
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.5	Sun Apr 29 23:30:59 2018
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua	Mon Apr 30 22:17:46 2018
@@ -32,7 +32,7 @@
 -- command line args
 dofile "optparse.lua"
 
-opt = OptionParser{usage="%prog [options] file", version="20180428"}   
+opt = OptionParser{usage="%prog [options] file", version="20180430"}   
 
 opt.add_option{"-s", "--sign", action="store_true", dest="sign", help="--sign [--detached] [--armour] file"}
 opt.add_option{"-v", "--verify", action="store_true", dest="verify", help="--verify [--armour] file"}
@@ -72,6 +72,9 @@ end
 if options.homedir then
 	netpgp.homedir(pgp, options.homedir)
 end
+if options.decrypt or options.sign then
+netpgp.setvar(pgp, "need seckey", 1)
+end
 
 -- initialise everything
 netpgp.init(pgp)

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Mon Apr 30 21:40:59 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: optparse.lua

Log Message:
Unbreak script for Lua 5.3.
This change breaks support for older releases of Lua but it is deemed ok.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/optparse.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/optparse.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/optparse.lua:1.1 src/crypto/external/bsd/netpgp/dist/bindings/lua/optparse.lua:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/optparse.lua:1.1	Mon Oct 12 02:55:46 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/optparse.lua	Mon Apr 30 21:40:59 2018
@@ -42,7 +42,7 @@ function OptionParser(t)
   end
   function o.parse_args()
 -- expand options (e.g. "--input=file" -> "--input", "file")
-local arg = {unpack(arg)}
+local arg = {table.unpack(arg)}
 for i=#arg,1,-1 do local v = arg[i]
   local flag, val = v:match('^(%-%-%w+)=(.*)')
   if flag then

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr 29 23:31:00 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua

Log Message:
sign_file function expects 5 parameters, include the output filename.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.4 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.5
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.4	Mon Oct 19 01:07:08 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua	Sun Apr 29 23:30:59 2018
@@ -32,7 +32,7 @@
 -- command line args
 dofile "optparse.lua"
 
-opt = OptionParser{usage="%prog [options] file", version="20090711"}   
+opt = OptionParser{usage="%prog [options] file", version="20180428"}   
 
 opt.add_option{"-s", "--sign", action="store_true", dest="sign", help="--sign [--detached] [--armour] file"}
 opt.add_option{"-v", "--verify", action="store_true", dest="verify", help="--verify [--armour] file"}
@@ -89,7 +89,7 @@ for i = 1, #args do
 	end
 	if options.sign then
 		-- detached signature
-		netpgp.sign_file(pgp, args[1], output, armour, detached)
+		netpgp.sign_file(pgp, args[1], args[1] .. ".sig", armour, detached)
 		os.execute("ls -l " .. args[1] .. ".sig")
 	end
 	if options.verify then

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr 29 19:34:57 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: glue.c

Log Message:
Add support for Lua 5.3


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.4 src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.5
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.4	Sun Apr 29 19:31:38 2018
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c	Sun Apr 29 19:34:57 2018
@@ -334,7 +334,7 @@ l_getvar(lua_State *L)
 	return 1;
 }
 
-const struct luaL_reg libluanetpgp[] = {
+const struct luaL_Reg libluanetpgp[] = {
 	{ "new",		l_new },
 	{ "init",		l_init },
 
@@ -358,6 +358,10 @@ const struct luaL_reg libluanetpgp[] = {
 int 
 luaopen_netpgp(lua_State *L)
 {
-	luaL_openlib(L, "netpgp", libluanetpgp, 0);
+#if LUA_VERSION_NUM >= 502
+	luaL_newlib(L, libluanetpgp);
+#else
+	luaL_register(L, "netpgp", libluanetpgp);
+#endif
 	return 1;
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr 29 19:31:38 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: glue.c

Log Message:
Enable checking arguments for validity.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.3 src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.4
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.3	Sun Apr 29 19:28:11 2018
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c	Sun Apr 29 19:31:38 2018
@@ -38,6 +38,7 @@
 #include 
 
 #define LUA_LIB
+#define LUA_USE_APICHECK
 #include 
 #include 
 #include 

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr 29 19:28:11 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: glue.c

Log Message:
Utilise the passed output filename rather that using a hardcoded name


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.2 src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.3
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.2	Sun Oct 18 07:14:19 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c	Sun Apr 29 19:28:11 2018
@@ -161,7 +161,7 @@ l_encrypt_file(lua_State *L)
 	}
 	armour = findtype(armourtypes, luaL_checkstring(L, 4));
 	ret = netpgp_encrypt_file(netpgp, netpgp_getvar(netpgp, "userid"),
-f, __UNCONST("a.gpg"), armour);
+f, __UNCONST(output), armour);
 	lua_pushnumber(L, ret);
 	return 1;
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr 29 14:21:16 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Add the following functions to the list (TODO - add descriptions)
netpgp_unsetvar
netpgp_list_keys_json
netpgp_match_keys
netpgp_match_keys_json
netpgp_match_pubkeys
netpgp_validate_sigs
netpgp_format_json

Remove netpgp_match_list_keys() as function does not exist

Add missing output file to netpgp_verify_file() argument list

Sprinkle const to arguments


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.22 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.23
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.22	Mon Apr 16 08:17:18 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Sun Apr 29 14:21:16 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.22 2018/04/16 08:17:18 wiz Exp $
+.\" $NetBSD: libnetpgp.3,v 1.23 2018/04/29 14:21:16 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 15, 2018
+.Dd April 29, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -79,6 +79,10 @@ The following functions are for variable
 .Fo netpgp_incvar
 .Fa "netpgp_t *netpgp" "const char *name" "const int delta"
 .Fc
+.Ft int
+.Fo netpgp_unsetvar
+.Fa "netpgp_t *netpgp" "const char *name"
+.Fc
 .Pp
 The following function sets the home directory:
 .Ft int
@@ -92,8 +96,20 @@ The following functions are used for key
 .Fa "netpgp_t *netpgp" "const int printsigs"
 .Fc
 .Ft int
-.Fo netpgp_match_list_keys
-.Fa "netpgp_t *netpgp" "char *pattern"
+.Fo netpgp_list_keys_json
+.Fa "netpgp_t *netpgp" "char **json" "const int psigs"
+.Fc
+.Ft int
+.Fo netpgp_match_keys
+.Fa "netpgp_t *netpgp" "char *name" "const char *fmt" "void *vp" "const int psigs"
+.Fc
+.Ft int
+.Fo netpgp_match_keys_json
+.Fa "netpgp_t *netpgp" "char **json" "char *name" "const char *fmt" "const int psigs"
+.Fc
+.Ft int
+.Fo netpgp_match_pubkeys
+.Fa "netpgp_t *netpgp" "char *name" "void *vp"
 .Fc
 .Ft int
 .Fo netpgp_find_key
@@ -101,7 +117,7 @@ The following functions are used for key
 .Fc
 .Ft char *
 .Fo netpgp_get_key
-.Fa "netpgp_t *netpgp" "const char *id"
+.Fa "netpgp_t *netpgp" "const char *name" "const char *fmt"
 .Fc
 .Ft int
 .Fo netpgp_export_key
@@ -115,31 +131,39 @@ The following functions are used for key
 .Fo netpgp_generate_key
 .Fa "netpgp_t *netpgp" "char *userid" "int numbits"
 .Fc
+.Ft int
+.Fo netpgp_validate_sigs
+.Fa "netpgp_t *netpgp"
+.Fc
+.Ft int
+.Fo netpgp_format_json
+.Fa "void *vp" "const char *json" "const int psigs"
+.Fc
 .Pp
 The following functions are used for file management:
 .Ft int
 .Fo netpgp_encrypt_file
-.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
+.Fa "netpgp_t *netpgp" "const char *userid" "const char *filename" "char *out"
 .Fa "int armored"
 .Fc
 .Ft int
 .Fo netpgp_decrypt_file
-.Fa "netpgp_t *netpgp" "char *filename" "char *out" "int armored"
+.Fa "netpgp_t *netpgp" "const char *filename" "char *out" "int armored"
 .Fc
 .Ft int
 .Fo netpgp_sign_file
-.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
+.Fa "netpgp_t *netpgp" "const char *userid" "const char *filename" "char *out"
 .Fa "int armored" "int cleartext" "int detached"
 .Fc
 .Ft int
 .Fo netpgp_verify_file
-.Fa "netpgp_t *netpgp" "char *f" "int armored"
+.Fa "netpgp_t *netpgp" "const char *in" "const char *out" "int armored"
 .Fc
 .Pp
 The following functions are used for memory signing and encryption:
 .Ft int
 .Fo netpgp_encrypt_memory
-.Fa "netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize"
+.Fa "netpgp_t *netpgp" "const char *userid" "void *in" "const size_t insize"
 .Fa "char *out" "size_t outsize" "int armored"
 .Fc
 .Ft int
@@ -206,13 +230,6 @@ To list all the keys in a keyring, the
 function is used.
 The signature subkey fields can also be displayed
 using this function.
-The
-.Fn netpgp_match_list_keys
-function is used to match (via regular expression)
-a subset of the keys in the keyring.
-If the expression to match is NULL,
-the search will degenerate into a
-listing of all keys in the keyring.
 .Pp
 The home directory is specified as an internal variable,
 and its existence is checked using the

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Apr 16 08:17:18 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.21 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.22
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.21	Sun Apr 15 23:00:36 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Mon Apr 16 08:17:18 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.21 2018/04/15 23:00:36 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.22 2018/04/16 08:17:18 wiz Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -173,7 +173,7 @@ Normal operation sees the
 process be initialised using the
 .Fn netpgp_init
 function, which will set up the public and private keyrings, as well as set the
-user identity in the 
+user identity in the
 .Ar userid
 member of the
 .Dv netpgp_t

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr 15 23:00:36 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Break down explanation of netpgp_init to make it easier to extend.
Document how the userid is obtained.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.20 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.21
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.20	Wed Apr  4 21:39:35 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Sun Apr 15 23:00:36 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.20 2018/04/04 21:39:35 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.21 2018/04/15 23:00:36 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 3, 2018
+.Dd April 15, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -172,12 +172,13 @@ Normal operation sees the
 .Nm
 process be initialised using the
 .Fn netpgp_init
-function, which will set up the public and private keyrings, and set the
-user identity to the
+function, which will set up the public and private keyrings, as well as set the
+user identity in the 
 .Ar userid
-argument passed stored in the
+member of the
 .Dv netpgp_t
-structure, and set using the
+structure.
+These are set using the
 .Fn netpgp_setvar
 function.
 If no public key ring file is set, initial values will be taken from those
@@ -189,6 +190,13 @@ initial values will be taken from those
 in the
 .Pa .gnupg/secring.gpg
 file in the user's home directory.
+The user identity is obtained from the
+.Ev userid
+environment variable, or failing that, the value of the
+.Dq default-key
+setting from
+.Pa .gnupg/gpg.conf
+file in the user's home directory is used.
 The
 .Fn netpgp_init
 function returns 1 on success, 0 on failure.

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed Apr  4 21:39:35 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3
src/crypto/external/bsd/netpgp/dist/src/libbn: libnetpgpbn.3
src/crypto/external/bsd/netpgp/dist/src/libmj: libmj.3
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: netpgpverify.1

Log Message:
Drop superfluous zero prefix for single digit number days.

heads up by wiz


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.19	Tue Apr  3 21:57:14 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Wed Apr  4 21:39:35 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.19 2018/04/03 21:57:14 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.20 2018/04/04 21:39:35 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 03, 2018
+.Dd April 3, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME

Index: src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3
diff -u src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3:1.5 src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3:1.6
--- src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3:1.5	Tue Apr  3 21:57:14 2018
+++ src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3	Wed Apr  4 21:39:35 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgpbn.3,v 1.5 2018/04/03 21:57:14 sevan Exp $
+.\" $NetBSD: libnetpgpbn.3,v 1.6 2018/04/04 21:39:35 sevan Exp $
 .\"
 .\" Copyright (c) 2010 Alistair Crooks 
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 03, 2018
+.Dd April 3, 2018
 .Dt LIBNETPGPBN 3
 .Os
 .Sh NAME

Index: src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3:1.8 src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3:1.9
--- src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3:1.8	Tue Apr  3 21:57:14 2018
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3	Wed Apr  4 21:39:35 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libmj.3,v 1.8 2018/04/03 21:57:14 sevan Exp $
+.\" $NetBSD: libmj.3,v 1.9 2018/04/04 21:39:35 sevan Exp $
 .\"
 .\" Copyright (c) 2010 Alistair Crooks 
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 03, 2018
+.Dd April 3, 2018
 .Dt LIBMJ 3
 .Os
 .Sh NAME

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.12 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.13
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.12	Tue Apr  3 21:57:14 2018
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1	Wed Apr  4 21:39:35 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpverify.1,v 1.12 2018/04/03 21:57:14 sevan Exp $
+.\" $NetBSD: netpgpverify.1,v 1.13 2018/04/04 21:39:35 sevan Exp $
 .\"
 .\" Copyright (c) 2013,2014,2015 Alistair Crooks 
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 03, 2018
+.Dd April 3, 2018
 .Dt NETPGPVERIFY 1
 .Os
 .Sh NAME

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Tue Apr  3 21:57:15 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3
src/crypto/external/bsd/netpgp/dist/src/libbn: libnetpgpbn.3
src/crypto/external/bsd/netpgp/dist/src/libmj: libmj.3
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: netpgpverify.1

Log Message:
Some further changes from PR bin/48395.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.18	Mon Apr  2 10:30:06 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Tue Apr  3 21:57:14 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.18 2018/04/02 10:30:06 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.19 2018/04/03 21:57:14 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 2014
+.Dd April 03, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -223,13 +223,13 @@ Output is sent to the standard output.
 .Pp
 To import a key onto the public keyring, the
 .Fn netpgp_import_key
-is used.
+function is used.
 The name of the file containing the key to be imported is provided
 as the filename argument.
 .Pp
 To generate a key, the
 .Fn netpgp_generate_key
-is used.
+function is used.
 It takes an argument of the number of bits to use in the key.
 At the time that this manual page was created (April 2009),
 the recommendations are that the bare minimum key size

Index: src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3
diff -u src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3:1.4 src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3:1.5
--- src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3:1.4	Mon Feb 17 07:23:18 2014
+++ src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3	Tue Apr  3 21:57:14 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgpbn.3,v 1.4 2014/02/17 07:23:18 agc Exp $
+.\" $NetBSD: libnetpgpbn.3,v 1.5 2018/04/03 21:57:14 sevan Exp $
 .\"
 .\" Copyright (c) 2010 Alistair Crooks 
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 2014
+.Dd April 03, 2018
 .Dt LIBNETPGPBN 3
 .Os
 .Sh NAME
@@ -257,7 +257,7 @@ in the
 buffer called
 .Va buf
 where
-.Dq USERNAME
+.Dq USER
 is the name of the user taken from the runtime environment.
 The encoded text will be in an allocated buffer called
 .Va s .

Index: src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3:1.7 src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3:1.8
--- src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3:1.7	Mon Feb 17 07:23:18 2014
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3	Tue Apr  3 21:57:14 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libmj.3,v 1.7 2014/02/17 07:23:18 agc Exp $
+.\" $NetBSD: libmj.3,v 1.8 2018/04/03 21:57:14 sevan Exp $
 .\"
 .\" Copyright (c) 2010 Alistair Crooks 
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 2014
+.Dd April 03, 2018
 .Dt LIBMJ 3
 .Os
 .Sh NAME
@@ -227,10 +227,10 @@ in the
 buffer called
 .Va buf
 where
-.Dq USERNAME
+.Dq USER
 is the name of the user taken from the runtime environment.
 The encoded text will be in an allocated buffer called
-.Va s
+.Va s .
 .Bd -literal -offset indent
 mj_t atom;
 char buf[BUFSIZ];

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.11	Mon Apr 17 19:50:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1	Tue Apr  3 21:57:14 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpverify.1,v 1.11 2017/04/17 19:50:28 agc Exp $
+.\" 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Mon Apr  2 10:30:07 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Revert previous change as the typedef should now work as intended.
Thanks christos, martin


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.18
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.17	Sun Apr  1 23:25:27 2018
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Mon Apr  2 10:30:06 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.17 2018/04/01 23:25:27 sevan Exp $
+.\" $NetBSD: libnetpgp.3,v 1.18 2018/04/02 10:30:06 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 02, 2018
+.Dd February 16, 2014
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -41,11 +41,11 @@
 The following functions relate to initialisations and finalisations:
 .Ft int
 .Fo netpgp_init
-.Fa "struct netpgp_t *netpgp"
+.Fa "netpgp_t *netpgp"
 .Fc
 .Ft int
 .Fo netpgp_end
-.Fa "struct netpgp_t *netpgp"
+.Fa "netpgp_t *netpgp"
 .Fc
 .Pp
 The following functions are for debugging, reflection and information:
@@ -63,99 +63,99 @@ The following functions are for debuggin
 .Fc
 .Ft int
 .Fo netpgp_list_packets
-.Fa "struct netpgp_t *netpgp" "char *filename" "int armour" "char *pubringname"
+.Fa "netpgp_t *netpgp" "char *filename" "int armour" "char *pubringname"
 .Fc
 .Pp
 The following functions are for variable management:
 .Ft int
 .Fo netpgp_setvar
-.Fa "struct netpgp_t *netpgp" "const char *name" "const char *value"
+.Fa "netpgp_t *netpgp" "const char *name" "const char *value"
 .Fc
 .Ft char *
 .Fo netpgp_getvar
-.Fa "struct netpgp_t *netpgp" "const char *name"
+.Fa "netpgp_t *netpgp" "const char *name"
 .Fc
 .Ft int
 .Fo netpgp_incvar
-.Fa "struct netpgp_t *netpgp" "const char *name" "const int delta"
+.Fa "netpgp_t *netpgp" "const char *name" "const int delta"
 .Fc
 .Pp
 The following function sets the home directory:
 .Ft int
 .Fo netpgp_set_homedir
-.Fa "struct netpgp_t *netpgp" "char *homedir" "char *subdir" "const int quiet"
+.Fa "netpgp_t *netpgp" "char *homedir" "char *subdir" "const int quiet"
 .Fc
 .Pp
 The following functions are used for key management:
 .Ft int
 .Fo netpgp_list_keys
-.Fa "struct netpgp_t *netpgp" "const int printsigs"
+.Fa "netpgp_t *netpgp" "const int printsigs"
 .Fc
 .Ft int
 .Fo netpgp_match_list_keys
-.Fa "struct netpgp_t *netpgp" "char *pattern"
+.Fa "netpgp_t *netpgp" "char *pattern"
 .Fc
 .Ft int
 .Fo netpgp_find_key
-.Fa "struct netpgp_t *netpgp" "char *userid"
+.Fa "netpgp_t *netpgp" "char *userid"
 .Fc
 .Ft char *
 .Fo netpgp_get_key
-.Fa "struct netpgp_t *netpgp" "const char *id"
+.Fa "netpgp_t *netpgp" "const char *id"
 .Fc
 .Ft int
 .Fo netpgp_export_key
-.Fa "struct netpgp_t *netpgp" "char *userid"
+.Fa "netpgp_t *netpgp" "char *userid"
 .Fc
 .Ft int
 .Fo netpgp_import_key
-.Fa "struct netpgp_t *netpgp" "char *file"
+.Fa "netpgp_t *netpgp" "char *file"
 .Fc
 .Ft int
 .Fo netpgp_generate_key
-.Fa "struct netpgp_t *netpgp" "char *userid" "int numbits"
+.Fa "netpgp_t *netpgp" "char *userid" "int numbits"
 .Fc
 .Pp
 The following functions are used for file management:
 .Ft int
 .Fo netpgp_encrypt_file
-.Fa "struct netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
+.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
 .Fa "int armored"
 .Fc
 .Ft int
 .Fo netpgp_decrypt_file
-.Fa "struct netpgp_t *netpgp" "char *filename" "char *out" "int armored"
+.Fa "netpgp_t *netpgp" "char *filename" "char *out" "int armored"
 .Fc
 .Ft int
 .Fo netpgp_sign_file
-.Fa "struct netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
+.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
 .Fa "int armored" "int cleartext" "int detached"
 .Fc
 .Ft int
 .Fo netpgp_verify_file
-.Fa "struct netpgp_t *netpgp" "char *f" "int armored"
+.Fa "netpgp_t *netpgp" "char *f" "int armored"
 .Fc
 .Pp
 The following functions are used for memory signing and encryption:
 .Ft int
 .Fo netpgp_encrypt_memory
-.Fa "struct netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize"
+.Fa "netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize"
 .Fa "char *out" "size_t outsize" "int armored"
 .Fc
 .Ft int
 .Fo netpgp_decrypt_memory
-.Fa "struct netpgp_t *netpgp" "const void *input" "const size_t insize"
+.Fa "netpgp_t *netpgp" "const void *input" "const size_t insize"
 .Fa "char *out" "size_t outsize" 

CVS commit: src/crypto/external/bsd/netpgp/dist/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Apr  1 23:38:02 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/include: netpgp.h

Log Message:
remove unused struct tag.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/netpgp/dist/include/netpgp.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/include/netpgp.h
diff -u src/crypto/external/bsd/netpgp/dist/include/netpgp.h:1.21 src/crypto/external/bsd/netpgp/dist/include/netpgp.h:1.22
--- src/crypto/external/bsd/netpgp/dist/include/netpgp.h:1.21	Mon Sep  6 14:19:38 2010
+++ src/crypto/external/bsd/netpgp/dist/include/netpgp.h	Sun Apr  1 19:38:02 2018
@@ -42,7 +42,7 @@
 __BEGIN_DECLS
 
 /* structure used to hold (key,value) pair information */
-typedef struct netpgp_t {
+typedef struct {
 	unsigned	  c;		/* # of elements used */
 	unsigned	  size;		/* size of array */
 	char		**name;		/* key names */

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Apr  1 23:25:28 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
netpgp_t is a structure


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.16 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.17
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.16	Mon Feb 17 07:23:18 2014
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Sun Apr  1 23:25:27 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.16 2014/02/17 07:23:18 agc Exp $
+.\" $NetBSD: libnetpgp.3,v 1.17 2018/04/01 23:25:27 sevan Exp $
 .\"
 .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 2014
+.Dd April 02, 2018
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -41,11 +41,11 @@
 The following functions relate to initialisations and finalisations:
 .Ft int
 .Fo netpgp_init
-.Fa "netpgp_t *netpgp"
+.Fa "struct netpgp_t *netpgp"
 .Fc
 .Ft int
 .Fo netpgp_end
-.Fa "netpgp_t *netpgp"
+.Fa "struct netpgp_t *netpgp"
 .Fc
 .Pp
 The following functions are for debugging, reflection and information:
@@ -63,99 +63,99 @@ The following functions are for debuggin
 .Fc
 .Ft int
 .Fo netpgp_list_packets
-.Fa "netpgp_t *netpgp" "char *filename" "int armour" "char *pubringname"
+.Fa "struct netpgp_t *netpgp" "char *filename" "int armour" "char *pubringname"
 .Fc
 .Pp
 The following functions are for variable management:
 .Ft int
 .Fo netpgp_setvar
-.Fa "netpgp_t *netpgp" "const char *name" "const char *value"
+.Fa "struct netpgp_t *netpgp" "const char *name" "const char *value"
 .Fc
 .Ft char *
 .Fo netpgp_getvar
-.Fa "netpgp_t *netpgp" "const char *name"
+.Fa "struct netpgp_t *netpgp" "const char *name"
 .Fc
 .Ft int
 .Fo netpgp_incvar
-.Fa "netpgp_t *netpgp" "const char *name" "const int delta"
+.Fa "struct netpgp_t *netpgp" "const char *name" "const int delta"
 .Fc
 .Pp
 The following function sets the home directory:
 .Ft int
 .Fo netpgp_set_homedir
-.Fa "netpgp_t *netpgp" "char *homedir" "char *subdir" "const int quiet"
+.Fa "struct netpgp_t *netpgp" "char *homedir" "char *subdir" "const int quiet"
 .Fc
 .Pp
 The following functions are used for key management:
 .Ft int
 .Fo netpgp_list_keys
-.Fa "netpgp_t *netpgp" "const int printsigs"
+.Fa "struct netpgp_t *netpgp" "const int printsigs"
 .Fc
 .Ft int
 .Fo netpgp_match_list_keys
-.Fa "netpgp_t *netpgp" "char *pattern"
+.Fa "struct netpgp_t *netpgp" "char *pattern"
 .Fc
 .Ft int
 .Fo netpgp_find_key
-.Fa "netpgp_t *netpgp" "char *userid"
+.Fa "struct netpgp_t *netpgp" "char *userid"
 .Fc
 .Ft char *
 .Fo netpgp_get_key
-.Fa "netpgp_t *netpgp" "const char *id"
+.Fa "struct netpgp_t *netpgp" "const char *id"
 .Fc
 .Ft int
 .Fo netpgp_export_key
-.Fa "netpgp_t *netpgp" "char *userid"
+.Fa "struct netpgp_t *netpgp" "char *userid"
 .Fc
 .Ft int
 .Fo netpgp_import_key
-.Fa "netpgp_t *netpgp" "char *file"
+.Fa "struct netpgp_t *netpgp" "char *file"
 .Fc
 .Ft int
 .Fo netpgp_generate_key
-.Fa "netpgp_t *netpgp" "char *userid" "int numbits"
+.Fa "struct netpgp_t *netpgp" "char *userid" "int numbits"
 .Fc
 .Pp
 The following functions are used for file management:
 .Ft int
 .Fo netpgp_encrypt_file
-.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
+.Fa "struct netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
 .Fa "int armored"
 .Fc
 .Ft int
 .Fo netpgp_decrypt_file
-.Fa "netpgp_t *netpgp" "char *filename" "char *out" "int armored"
+.Fa "struct netpgp_t *netpgp" "char *filename" "char *out" "int armored"
 .Fc
 .Ft int
 .Fo netpgp_sign_file
-.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
+.Fa "struct netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
 .Fa "int armored" "int cleartext" "int detached"
 .Fc
 .Ft int
 .Fo netpgp_verify_file
-.Fa "netpgp_t *netpgp" "char *f" "int armored"
+.Fa "struct netpgp_t *netpgp" "char *f" "int armored"
 .Fc
 .Pp
 The following functions are used for memory signing and encryption:
 .Ft int
 .Fo netpgp_encrypt_memory
-.Fa "netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize"
+.Fa "struct netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize"
 .Fa "char *out" "size_t outsize" "int armored"
 .Fc
 .Ft int
 .Fo netpgp_decrypt_memory
-.Fa "netpgp_t *netpgp" "const void *input" "const size_t insize"
+.Fa "struct netpgp_t *netpgp" "const void *input" "const size_t insize"
 .Fa "char *out" "size_t outsize" "const int armored"
 .Fc
 .Ft int
 .Fo netpgp_sign_memory
-.Fa 

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Feb  5 23:56:01 UTC 2018

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: openssl_crypto.c
signature.c
src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile

Log Message:
centralize the conversion functions and make this work with both
openssl-1.0 and 1.1


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 \
src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c
cvs rdiff -u -r1.37 -r1.38 \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c:1.33 src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c:1.34
--- src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c:1.33	Sun Nov  7 03:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c	Mon Feb  5 18:56:01 2018
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: openssl_crypto.c,v 1.33 2010/11/07 08:39:59 agc Exp $");
+__RCSID("$NetBSD: openssl_crypto.c,v 1.34 2018/02/05 23:56:01 christos Exp $");
 #endif
 
 #ifdef HAVE_OPENSSL_DSA_H
@@ -89,18 +89,144 @@ __RCSID("$NetBSD: openssl_crypto.c,v 1.3
 #include "netpgpdigest.h"
 #include "packet.h"
 
+static void
+takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
+{
+	const BIGNUM *n, *e, *d, *q, *p;
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+	RSA_get0_key(orsa, , , );
+	RSA_get0_factors(orsa, , );
+#else
+	n = orsa->n;
+	e = orsa->e;
+	d = orsa->d;
+	p = orsa->p;
+	q = orsa->q;
+#endif
+	if (sk) {
+		sk->d = BN_dup(d);
+		sk->p = BN_dup(p);
+		sk->q = BN_dup(q);
+	}
+	if (pk) {
+		pk->n = BN_dup(n);
+		pk->e = BN_dup(e);
+	}
+}
 
-static void 
-test_seckey(const pgp_seckey_t *seckey)
+static RSA *
+makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
+{
+	BIGNUM	*n, *e, *d, *p, *q;
+	RSA *orsa;
+
+	orsa = RSA_new();
+	n = BN_dup(pubkey->n);
+	e = BN_dup(pubkey->e);
+
+	if (seckey) {
+		d = BN_dup(seckey->d);
+		p = BN_dup(seckey->p);
+		q = BN_dup(seckey->q);
+	} else {
+		d = p = q = NULL;
+	}
+
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+	RSA_set0_key(orsa, n, e, d);
+	RSA_set0_factors(orsa, p, q);
+#else
+	BN_free(orsa->n);
+	BN_free(orsa->e);
+	orsa->n = n;
+	orsa->e = e;
+	if (d) {
+		BN_free(orsa->d);
+		orsa->d = d;
+	}
+	if (p) {
+		BN_free(orsa->p);
+		orsa->p = p;
+	}
+	if (q) {
+		BN_free(orsa->q);
+		orsa->q = q;
+	}
+#endif
+	return orsa;
+}
+
+static DSA_SIG *
+makeDSA_SIG(const pgp_dsa_sig_t *sig)
+{
+	DSA_SIG*osig;
+	BIGNUM	   *r, *s;
+
+	osig = DSA_SIG_new();
+	r = BN_dup(sig->r);
+	s = BN_dup(sig->s);
+
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+	DSA_SIG_set0(osig, r, s);
+#else
+	BN_free(osig->r);
+	BN_free(osig->s);
+	osig->r = r;
+	osig->s = s;
+#endif
+
+	return osig;
+}
+
+static DSA *
+makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
 {
-	RSA*test = RSA_new();
+	DSA*odsa;
+	BIGNUM	   *p, *q, *g, *y, *x;
 
-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
+	odsa = DSA_new();
 
-	test->d = BN_dup(seckey->key.rsa.d);
-	test->p = BN_dup(seckey->key.rsa.p);
-	test->q = BN_dup(seckey->key.rsa.q);
+	p = BN_dup(dsa->p);
+	q = BN_dup(dsa->q);
+	g = BN_dup(dsa->g);
+	y = BN_dup(dsa->y);
+	x = secdsa ? secdsa->x : NULL;
+
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+	DSA_set0_key(odsa, y, x);
+#else
+	BN_free(odsa->p);
+	BN_free(odsa->q);
+	BN_free(odsa->g);
+	BN_free(odsa->pub_key);
+	odsa->p = p;
+	odsa->q = q;
+	odsa->g = g;
+	odsa->pub_key = y;
+	if (x) {
+		BN_free(odsa->priv_key);
+		odsa->priv_key = x;
+	}
+#endif
+	return odsa;
+}
+
+static void
+takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
+{
+	const BIGNUM *x;
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+	DSA_get0_key(odsa, NULL, );
+#else
+	x = odsa->priv_key;
+#endif
+	sk->x = BN_dup(x);
+}
+
+static void 
+test_seckey(const pgp_seckey_t *seckey)
+{
+	RSA *test = makeRSA(>pubkey.key.rsa, >key.rsa);
 
 	if (RSA_check_key(test) != 1) {
 		(void) fprintf(stderr,
@@ -435,25 +561,15 @@ pgp_dsa_verify(const uint8_t *hash, size
 	   const pgp_dsa_pubkey_t *dsa)
 {
 	unsigned	qlen;
-	DSA_SIG*osig;
-	DSA*odsa;
+	DSA_SIG*osig = makeDSA_SIG(sig);
+	DSA	   *odsa = makeDSA(dsa, NULL);
 	int ret;
 
-	osig = DSA_SIG_new();
-	osig->r = sig->r;
-	osig->s = sig->s;
-
-	odsa = DSA_new();
-	odsa->p = dsa->p;
-	odsa->q = dsa->q;
-	odsa->g = dsa->g;
-	odsa->pub_key = dsa->y;
-
 	if (pgp_get_debug_level(__FILE__)) {
 		hexdump(stderr, "input hash", hash, 

CVS commit: src/crypto/external/bsd/netpgp/lib/verify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Mon Apr 17 23:38:51 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/lib/verify: shlib_version

Log Message:
libnetpgpverify major bump to 5


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/lib/verify/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/lib/verify/shlib_version
diff -u src/crypto/external/bsd/netpgp/lib/verify/shlib_version:1.2 src/crypto/external/bsd/netpgp/lib/verify/shlib_version:1.3
--- src/crypto/external/bsd/netpgp/lib/verify/shlib_version:1.2	Tue Nov 20 05:26:26 2012
+++ src/crypto/external/bsd/netpgp/lib/verify/shlib_version	Mon Apr 17 23:38:51 2017
@@ -1,2 +1,2 @@
-major=4
+major=5
 minor=0

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Mon Apr 17 19:50:28 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
Makefile.in Makefile.lib.in Makefile.libtool.in array.h bignum.c
digest.c digest.h libnetpgpverify.3 libverify.c main.c
netpgpverify.1 pgpsum.c verify.h
src/crypto/external/bsd/netpgp/lib/verify: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: tiger.c tiger.h

Log Message:
Update netpgpverify sources in base from 20160617 to 20170201 (i.e. bring
over changes from master sources in pkgsrc/security/netpgpverify, version 
20170201):

Changes:

Update netpgpverify (and libnetpgpverify) to 20160614
+ handle signatures created by gpg with "--no-emit-version", don't 
assume
there will always be a version string.
+ add a test for above
Fixes security PR  51240.
Thanks to x...@ubuntu.com for reporting the error

Update netpgpverify and libnetpgpverify to 20160615:
Simplify the method of finding the end of the versioning information
in the signature - back up to the "\n" character at the end of the
signature start:

"-BEGIN PGP SIGNATURE-\n"

and then find the "\n\n" character sequence to denote the start of the
signature itself. The previous version worked, but this is more 
efficient.

Update netpgpverify and libnetpgpverify to 20160616
+ bring over joerg's printflike change from the netpgpverify
version in src/crypto
+ add a test for cleartext signatures with version information
to complement the one with no version information

Update netpgpverify and libnetpgpverify to 20160622 during freeze to fix PR  
51262
+ take a bit of a step backwards, and don't use stdbool.h, just to 
appease
Solaris 10 compiler

Update netpgpverify and libnetpgpverify to 20160623
+ remove use of asprintf and vasprintf from libverify. Inspired
by work from Dimitri John Ledkov. Should allow building on Linux
without superfluous definitions.
+ also free the BIGNUM struct in PGPV_BN_clear() - from Dimitri
John Ledkov

Update netpgpverify and libnetpgpverify to 20160626
+ make the pgpv_t and pgpv_cursor_t structures opaque
+ add new accessor functions for fields in the pgpv_cursor_t struct
+ add new creation functions for the pgpv_t and pgpv_cursor_t structs

Update netpgpverify and libnetpgpverify to 20160704
+ get rid of redundant PGPV_ARRAY definition in libverify.c, brought in 
when
the definitions moved from verify.h
+ fix obuf_add_mem() to use a const void *, as any struct can be
dumped using it
+ remove redundant NO_SUBKEYS definition - unused
+ add an (unused as yet) ARRAY_FREE() macro

Update netpgpverify and libnetpgpverify to 20160705
External API changes

+ add a pgpv_cursor_close() function to free resources associated with
a cursor
Better memory management

+ restructure the way dynamic arrays are used, to avoid memory
corruption issues and memory leaks - keep all dynamic arrays in the 
global
data structure, and use indices in the other data structures to index 
them.
Means lack of data localisation, but avoids stale pointers, and leaks.
+ make signer field of signature a uint8_t array, rather than a pointer
+ use our own version of strdup(3) - don't depend on it being
available in standard library
+ keep track of whether litdata filenames and userid were allocated or 
not,
and free memory in pgpv_close() if it was allocated
+ free up allocated resources which were allocated in pgpv_close()

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.

Update netpgpverify and libnetpgpverify to 20160707 to fix some
unusual build errors shown by old gcc versions (works fine for
gcc-5.2.1 on ubuntu and gcc-5.3.0 on NetBSD 7.99.32)
+ use ULL suffix on unsigned 64bit constants, not UL
+ don't typedef the public structs twice - second time just define it
without the typedef
Fixes PR   51327

Update netpgpverify and libnetpgpverify to 20160708
+ clear and free bignums properly - helps immensely with plugging
memory leaks

Update netpgpverify and libnetpgpverify to 20160828
+ bring over change from christos in src/crypto to check for
the end of an ASCII-armored signature
+ no need for 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sun Apr  9 23:03:51 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: signature.c

Log Message:
No longer hard-code the suffix length

This will avoid a buffer overflow if the suffix changes; it is currently
hard-coded as either "asc" or "sig".

Submitted on tech-pkg@ as:
[PATCH 10/11] No longer hard-code the suffix length


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.36 src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.37
--- src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.36	Sun Apr  9 22:48:39 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c	Sun Apr  9 23:03:50 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: signature.c,v 1.36 2017/04/09 22:48:39 khorben Exp $");
+__RCSID("$NetBSD: signature.c,v 1.37 2017/04/09 23:03:50 khorben Exp $");
 #endif
 
 #include 
@@ -909,7 +909,7 @@ open_output_file(pgp_output_t **output,
 			fd = pgp_setup_file_write(output, outname, overwrite);
 		}
 	} else {
-		size_t  flen = strlen(inname) + 4 + 1;
+		size_t  flen = strlen(inname) + 1 + strlen(suffix) + 1;
 		char   *f = NULL;
 
 		if ((f = calloc(1, flen)) == NULL) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sun Apr  9 22:48:39 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: signature.c

Log Message:
Output signatures to the standard output for "-"

This is to reflect the behaviour documented in netpgp(1).

Submitted on tech-pkg@ as:
[PATCH 09/11] Output signatures to the standard output for "-"

Only modified for consistency with the coding style.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.35 src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.36
--- src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.35	Sun Apr  9 22:44:34 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c	Sun Apr  9 22:48:39 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: signature.c,v 1.35 2017/04/09 22:44:34 khorben Exp $");
+__RCSID("$NetBSD: signature.c,v 1.36 2017/04/09 22:48:39 khorben Exp $");
 #endif
 
 #include 
@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
 
 	/* setup output file */
 	if (outname) {
-		fd = pgp_setup_file_write(output, outname, overwrite);
+		if (strcmp(outname, "-") == 0) {
+			fd = pgp_setup_file_write(output, NULL, overwrite);
+		} else {
+			fd = pgp_setup_file_write(output, outname, overwrite);
+		}
 	} else {
 		size_t  flen = strlen(inname) + 4 + 1;
 		char   *f = NULL;

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sun Apr  9 22:44:34 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: signature.c

Log Message:
Avoid a type cast

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.34 src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.35
--- src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.34	Mon Mar  5 02:20:18 2012
+++ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c	Sun Apr  9 22:44:34 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: signature.c,v 1.34 2012/03/05 02:20:18 christos Exp $");
+__RCSID("$NetBSD: signature.c,v 1.35 2017/04/09 22:44:34 khorben Exp $");
 #endif
 
 #include 
@@ -905,7 +905,7 @@ open_output_file(pgp_output_t **output,
 	if (outname) {
 		fd = pgp_setup_file_write(output, outname, overwrite);
 	} else {
-		unsignedflen = (unsigned)(strlen(inname) + 4 + 1);
+		size_t  flen = strlen(inname) + 4 + 1;
 		char   *f = NULL;
 
 		if ((f = calloc(1, flen)) == NULL) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 21:34:32 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1

Log Message:
Also document alternate option "--detach"

Submitted on tech-pkg@ as:
[PATCH 08/11] Also document alternate option "--detach"


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.20 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.21
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.20	Mon Mar 27 21:30:23 2017
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1	Mon Mar 27 21:34:32 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.20 2017/03/27 21:30:23 khorben Exp $
+.\" $NetBSD: netpgp.1,v 1.21 2017/03/27 21:34:32 khorben Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -216,7 +216,7 @@ access to the cipher used.
 The default cipher algorithm is the
 .Dq CAST5
 algorithm.
-.It Fl Fl detached
+.It Fl Fl detach , Fl Fl detached
 When signing a file, place the resulting signature in a separate
 file from the one being signed.
 .It Fl Fl hash-alg Ar hash-algorithm

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 21:30:23 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1

Log Message:
Correct option "--armor"

Submitted on tech-pkg@ as:
[PATCH 07/11] Correct option "--armor"


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.19 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.20
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.19	Mon Feb 17 07:23:18 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1	Mon Mar 27 21:30:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.19 2014/02/17 07:23:18 agc Exp $
+.\" $NetBSD: netpgp.1,v 1.20 2017/03/27 21:30:23 khorben Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -203,7 +203,7 @@ library.
 In addition to one of the preceding commands, a number of qualifiers
 or options may be given.
 .Bl -tag -width Ar
-.It Fl Fl armour , Fl armor
+.It Fl Fl armour , Fl Fl armor
 This option, however it is spelled, wraps the signature as an
 ASCII-encoded piece of text, for ease of use.
 .It Fl Fl cipher Ar ciphername

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 21:19:12 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c

Log Message:
Do not ask for a passphrase when empty

Submitted on tech-pkg@ as:
[PATCH 06/11] Do not ask for a passphrase when empty

Only modified for consistency with the coding style.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.54 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.55
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.54	Mon Mar 27 21:06:50 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Mon Mar 27 21:19:12 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.54 2017/03/27 21:06:50 khorben Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.55 2017/03/27 21:19:12 khorben Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -226,7 +226,7 @@ typedef struct {
 	pgp_seckey_t		*seckey;
 } decrypt_t;
 
-static pgp_cb_ret_t 
+static pgp_cb_ret_t
 decrypt_cb(const pgp_packet_t *pkt, pgp_cbdata_t *cbinfo)
 {
 	const pgp_contents_t	*content = >u;
@@ -294,6 +294,20 @@ decrypt_cb(const pgp_packet_t *pkt, pgp_
 	return PGP_RELEASE_MEMORY;
 }
 
+static pgp_cb_ret_t
+decrypt_cb_empty(const pgp_packet_t *pkt, pgp_cbdata_t *cbinfo)
+{
+	const pgp_contents_t	*content = >u;
+
+	switch (pkt->tag) {
+	case PGP_GET_PASSPHRASE:
+		*content->skey_passphrase.passphrase = netpgp_strdup("");
+		return PGP_KEEP_MEMORY;
+	default:
+		return decrypt_cb(pkt, cbinfo);
+	}
+}
+
 /**
 \ingroup Core_Keys
 \brief Decrypts secret key from given keydata with given passphrase
@@ -308,8 +322,18 @@ pgp_decrypt_seckey(const pgp_key_t *key,
 	const int	 printerrors = 1;
 	decrypt_t	 decrypt;
 
+	/* XXX first try with an empty passphrase */
 	(void) memset(, 0x0, sizeof(decrypt));
 	decrypt.key = key;
+	stream = pgp_new(sizeof(*stream));
+	pgp_keydata_reader_set(stream, key);
+	pgp_set_callback(stream, decrypt_cb_empty, );
+	stream->readinfo.accumulate = 1;
+	pgp_parse(stream, !printerrors);
+	if (decrypt.seckey != NULL) {
+		return decrypt.seckey;
+	}
+	/* ask for a passphrase */
 	decrypt.passfp = passfp;
 	stream = pgp_new(sizeof(*stream));
 	pgp_keydata_reader_set(stream, key);

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 21:06:50 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c keyring.h

Log Message:
Expect a FILE * for pgp_decrypt_seckey()

Submitted on tech-pkg@ as:
[PATCH 05/11] Expect a FILE * for pgp_decrypt_seckey()

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.33 -r1.34 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.53 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.54
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.53	Mon Mar 27 21:00:43 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Mon Mar 27 21:06:50 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.53 2017/03/27 21:00:43 khorben Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.54 2017/03/27 21:06:50 khorben Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -302,7 +302,7 @@ decrypt_cb(const pgp_packet_t *pkt, pgp_
 \return secret key
 */
 pgp_seckey_t *
-pgp_decrypt_seckey(const pgp_key_t *key, void *passfp)
+pgp_decrypt_seckey(const pgp_key_t *key, FILE *passfp)
 {
 	pgp_stream_t	*stream;
 	const int	 printerrors = 1;

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.33 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.34
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.33	Mon Mar 27 20:55:13 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h	Mon Mar 27 21:06:50 2017
@@ -53,6 +53,7 @@
 #ifndef KEYRING_H_
 #define KEYRING_H_
 
+#include 
 #include "packet.h"
 #include "packet-parse.h"
 #include "mj.h"
@@ -91,7 +92,7 @@ const pgp_pubkey_t *pgp_get_pubkey(const
 unsigned   pgp_is_key_secret(const pgp_key_t *);
 const pgp_seckey_t *pgp_get_seckey(const pgp_key_t *);
 pgp_seckey_t *pgp_get_writable_seckey(pgp_key_t *);
-pgp_seckey_t *pgp_decrypt_seckey(const pgp_key_t *, void *);
+pgp_seckey_t *pgp_decrypt_seckey(const pgp_key_t *, FILE *);
 
 unsigned   pgp_keyring_fileread(pgp_keyring_t *, const unsigned,
 	const char *);

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 21:00:43 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c

Log Message:
Do not use random data for pass-phrases on EOF

Submitted on tech-pkg@ as:
[PATCH 04/11] Do not use random data for pass-phrases on EOF

Only modified for consistency with the coding style.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.52 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.53
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.52	Mon Mar 27 20:55:13 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Mon Mar 27 21:00:43 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.52 2017/03/27 20:55:13 khorben Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.53 2017/03/27 21:00:43 khorben Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -244,7 +244,9 @@ decrypt_cb(const pgp_packet_t *pkt, pgp_
 		break;
 
 	case PGP_GET_PASSPHRASE:
-		(void) pgp_getpassphrase(decrypt->passfp, pass, sizeof(pass));
+		if (pgp_getpassphrase(decrypt->passfp, pass, sizeof(pass)) == 0) {
+			pass[0] = '\0';
+		}
 		*content->skey_passphrase.passphrase = netpgp_strdup(pass);
 		pgp_forget(pass, sizeof(pass));
 		return PGP_KEEP_MEMORY;

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 20:55:13 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c keyring.h
netpgp.c

Log Message:
Avoid some type casts

Submitted on tech-pkg@ as:
[PATCH 03/11] Avoid some type casts

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.32 -r1.33 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
cvs rdiff -u -r1.100 -r1.101 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.51 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.52
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.51	Mon Feb 20 00:51:08 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Mon Mar 27 20:55:13 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.51 2017/02/20 00:51:08 khorben Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.52 2017/03/27 20:55:13 khorben Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -214,7 +214,7 @@ pgp_get_writable_seckey(pgp_key_t *data)
 
 /* utility function to zero out memory */
 void
-pgp_forget(void *vp, unsigned size)
+pgp_forget(void *vp, size_t size)
 {
 	(void) memset(vp, 0x0, size);
 }
@@ -246,7 +246,7 @@ decrypt_cb(const pgp_packet_t *pkt, pgp_
 	case PGP_GET_PASSPHRASE:
 		(void) pgp_getpassphrase(decrypt->passfp, pass, sizeof(pass));
 		*content->skey_passphrase.passphrase = netpgp_strdup(pass);
-		pgp_forget(pass, (unsigned)sizeof(pass));
+		pgp_forget(pass, sizeof(pass));
 		return PGP_KEEP_MEMORY;
 
 	case PGP_PARSER_ERRCODE:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.32 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.33
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.32	Sun Nov  7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h	Mon Mar 27 20:55:13 2017
@@ -100,7 +100,7 @@ int pgp_keyring_list(pgp_io_t *, const p
 int pgp_keyring_json(pgp_io_t *, const pgp_keyring_t *, mj_t *, const int);
 
 void pgp_set_seckey(pgp_contents_t *, const pgp_key_t *);
-void pgp_forget(void *, unsigned);
+void pgp_forget(void *, size_t);
 
 const uint8_t *pgp_get_key_id(const pgp_key_t *);
 unsigned pgp_get_userid_count(const pgp_key_t *);

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.100 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.101
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.100	Fri Feb 24 01:26:17 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Mon Mar 27 20:55:13 2017
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.100 2017/02/24 01:26:17 khorben Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.101 2017/03/27 20:55:13 khorben Exp $");
 #endif
 
 #include 
@@ -1411,7 +1411,7 @@ netpgp_sign_file(netpgp_t *netpgp,
 (unsigned)armored, (unsigned)cleartext,
 overwrite);
 	}
-	pgp_forget(seckey, (unsigned)sizeof(*seckey));
+	pgp_forget(seckey, sizeof(*seckey));
 	return ret;
 }
 
@@ -1542,7 +1542,7 @@ netpgp_sign_memory(netpgp_t *netpgp,
 	} else {
 		ret = 0;
 	}
-	pgp_forget(seckey, (unsigned)sizeof(*seckey));
+	pgp_forget(seckey, sizeof(*seckey));
 	return ret;
 }
 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 27 20:50:19 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: reader.c

Log Message:
Do not truncate pass-phrases without a newline character

This also fixes a crash when the pass-phrase entered is empty.

Submitted on tech-pkg@ as:
[PATCH 02/11] Do not truncate pass-phrases without a newline character

Only modified for consistency with the coding style.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.51 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.52
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.51	Fri Feb 24 01:27:14 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c	Mon Mar 27 20:50:19 2017
@@ -54,7 +54,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.51 2017/02/24 01:27:14 khorben Exp $");
+__RCSID("$NetBSD: reader.c,v 1.52 2017/03/27 20:50:19 khorben Exp $");
 #endif
 
 #include 
@@ -160,6 +160,7 @@ int
 pgp_getpassphrase(void *in, char *phrase, size_t size)
 {
 	char	*p;
+	size_t	 len;
 
 	if (in == NULL) {
 		while ((p = getpass("netpgp passphrase: ")) == NULL) {
@@ -169,7 +170,10 @@ pgp_getpassphrase(void *in, char *phrase
 		if (fgets(phrase, (int)size, in) == NULL) {
 			return 0;
 		}
-		phrase[strlen(phrase) - 1] = 0x0;
+		len = strlen(phrase);
+		if (len >= 1 && phrase[len - 1] == '\n') {
+			phrase[len - 1] = '\0';
+		}
 	}
 	return 1;
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Fri Feb 24 01:27:14 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: reader.c

Log Message:
Revert "Remove a useless loop around getpass()"

getpass(3) may return NULL upon failures on Linux, and netpgp should remain
portable to other systems.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.50 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.51
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.50	Mon Feb 20 01:33:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c	Fri Feb 24 01:27:14 2017
@@ -54,7 +54,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.50 2017/02/20 01:33:28 khorben Exp $");
+__RCSID("$NetBSD: reader.c,v 1.51 2017/02/24 01:27:14 khorben Exp $");
 #endif
 
 #include 
@@ -162,7 +162,8 @@ pgp_getpassphrase(void *in, char *phrase
 	char	*p;
 
 	if (in == NULL) {
-		p = getpass("netpgp passphrase: ");
+		while ((p = getpass("netpgp passphrase: ")) == NULL) {
+		}
 		(void) snprintf(phrase, size, "%s", p);
 	} else {
 		if (fgets(phrase, (int)size, in) == NULL) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Fri Feb 24 01:26:17 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
src/crypto/external/bsd/netpgp/dist/src/librsa: rsastubs.c

Log Message:
Revert "Remove a useless loop around getpass()"

getpass(3) may return NULL upon failures on Linux, and netpgp should remain
portable to other systems.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.99 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.100
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.99	Mon Feb 20 01:38:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Fri Feb 24 01:26:17 2017
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.99 2017/02/20 01:38:28 khorben Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.100 2017/02/24 01:26:17 khorben Exp $");
 #endif
 
 #include 
@@ -740,10 +740,14 @@ find_passphrase(FILE *passfp, const char
 	}
 	for (i = 0 ; i < attempts ; i++) {
 		(void) snprintf(prompt, sizeof(prompt), "Enter passphrase for %.16s: ", id);
-		cp = getpass(prompt);
+		if ((cp = getpass(prompt)) == NULL) {
+			break;
+		}
 		cc = snprintf(buf, sizeof(buf), "%s", cp);
 		(void) snprintf(prompt, sizeof(prompt), "Repeat passphrase for %.16s: ", id);
-		cp = getpass(prompt);
+		if ((cp = getpass(prompt)) == NULL) {
+			break;
+		}
 		cc = snprintf(passphrase, size, "%s", cp);
 		if (strcmp(buf, passphrase) == 0) {
 			(void) memset(buf, 0x0, sizeof(buf));

Index: src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c
diff -u src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.3 src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.3	Mon Feb 20 01:38:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c	Fri Feb 24 01:26:17 2017
@@ -43,7 +43,9 @@ pass_cb(char *buf, int size, int rwflag,
 
 	USE_ARG(rwflag);
 	snprintf(prompt, sizeof(prompt), "\"%s\" passphrase: ", (char *)u);
-	passphrase = getpass(prompt);
+	if ((passphrase = getpass(prompt)) == NULL) {
+		return -1;
+	}
 	(void) memcpy(buf, passphrase, (size_t)size);
 	return (int)strlen(passphrase);
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Feb 20 01:38:28 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
src/crypto/external/bsd/netpgp/dist/src/librsa: rsastubs.c

Log Message:
Remove a useless loop around getpass()

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


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.98 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.99
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.98	Tue Jun 28 16:34:40 2016
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Mon Feb 20 01:38:28 2017
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.98 2016/06/28 16:34:40 christos Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.99 2017/02/20 01:38:28 khorben Exp $");
 #endif
 
 #include 
@@ -740,14 +740,10 @@ find_passphrase(FILE *passfp, const char
 	}
 	for (i = 0 ; i < attempts ; i++) {
 		(void) snprintf(prompt, sizeof(prompt), "Enter passphrase for %.16s: ", id);
-		if ((cp = getpass(prompt)) == NULL) {
-			break;
-		}
+		cp = getpass(prompt);
 		cc = snprintf(buf, sizeof(buf), "%s", cp);
 		(void) snprintf(prompt, sizeof(prompt), "Repeat passphrase for %.16s: ", id);
-		if ((cp = getpass(prompt)) == NULL) {
-			break;
-		}
+		cp = getpass(prompt);
 		cc = snprintf(passphrase, size, "%s", cp);
 		if (strcmp(buf, passphrase) == 0) {
 			(void) memset(buf, 0x0, sizeof(buf));

Index: src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c
diff -u src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.2 src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.2	Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c	Mon Feb 20 01:38:28 2017
@@ -43,9 +43,7 @@ pass_cb(char *buf, int size, int rwflag,
 
 	USE_ARG(rwflag);
 	snprintf(prompt, sizeof(prompt), "\"%s\" passphrase: ", (char *)u);
-	if ((passphrase = getpass(prompt)) == NULL) {
-		return -1;
-	}
+	passphrase = getpass(prompt);
 	(void) memcpy(buf, passphrase, (size_t)size);
 	return (int)strlen(passphrase);
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Feb 20 01:33:28 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: reader.c

Log Message:
Remove a useless loop around getpass()

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


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.49 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.50
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.49	Mon Mar  5 02:20:18 2012
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c	Mon Feb 20 01:33:28 2017
@@ -54,7 +54,7 @@
 
 #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 
@@ -162,8 +162,7 @@ pgp_getpassphrase(void *in, char *phrase
 	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) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Feb 20 00:51:08 UTC 2017

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c

Log Message:
Do not crash when listing keys without a keyring

To test: (with an empty ~/.gnupg)
$ netpgpkeys --import-key /dev/null

Submitted on tech-pkg@ as:
[PATCH 01/11] Do not crash when listing keys without a keyring

Different patch for the same issue.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.50 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.51
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.50	Sat Jun 25 00:37:44 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Mon Feb 20 00:51:08 2017
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.50 2011/06/25 00:37:44 agc Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.51 2017/02/20 00:51:08 khorben Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -993,9 +993,12 @@ pgp_keyring_list(pgp_io_t *io, const pgp
 {
 	pgp_key_t		*key;
 	unsigned		 n;
+	unsigned		 keyc = (keyring != NULL) ? keyring->keyc : 0;
 
-	(void) fprintf(io->res, "%u key%s\n", keyring->keyc,
-		(keyring->keyc == 1) ? "" : "s");
+	(void) fprintf(io->res, "%u key%s\n", keyc, (keyc == 1) ? "" : "s");
+	if (keyring == NULL) {
+		return 1;
+	}
 	for (n = 0, key = keyring->keys; n < keyring->keyc; ++n, ++key) {
 		if (pgp_is_key_secret(key)) {
 			pgp_print_keydata(io, keyring, key, "sec",

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Mon Sep 12 16:54:32 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: netpgpverify.1

Log Message:
Add section number to the Xrefs
Remove a blank space at the end of the line 130 (makes mandoc -Tlint happy)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.9	Fri Jan 30 18:58:59 2015
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1	Mon Sep 12 16:54:31 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpverify.1,v 1.9 2015/01/30 18:58:59 agc Exp $
+.\" $NetBSD: netpgpverify.1,v 1.10 2016/09/12 16:54:31 abhinav Exp $
 .\"
 .\" Copyright (c) 2013,2014,2015 Alistair Crooks 
 .\" All rights reserved.
@@ -42,9 +42,9 @@ The
 implements digital signature verification.
 It is designed to be simple and standalone; no external libraries, except
 for
-.Xr libz
+.Xr libz 3
 and
-.Xr libbz2
+.Xr libbz2 3
 are used, in order to ensure maximum portability.
 .Pp
 It is completely rewritten from the version of the program that appeared in
@@ -128,7 +128,7 @@ Verification of a file's signature is be
 % netpgpverify -k pubring.gpg NetBSD-6.0_RC1_hashes.asc
 Good signature for NetBSD-6.0_RC1_hashes.asc made Thu Aug 23 11:47:50 2012
 signature 4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
-fingerprint   ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+fingerprint   ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e
 uid   NetBSD Security Officer 
 %
 .Ed

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep  3 09:31:22 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
Fix the error handling so that we print the earliest error message.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.11	Sun Aug 28 11:52:22 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Sat Sep  3 05:31:22 2016
@@ -2085,8 +2085,10 @@ setup_data(pgpv_cursor_t *cursor, pgpv_t
 {
 	FILE		*fp;
 	char		 buf[BUFSIZ];
+	int		 rv;
 
 	if (cursor == NULL || pgp == NULL || p == NULL) {
+		snprintf(cursor->why, sizeof(cursor->why), "No input data");
 		return 0;
 	}
 	memset(cursor, 0x0, sizeof(*cursor));
@@ -2104,19 +2106,19 @@ setup_data(pgpv_cursor_t *cursor, pgpv_t
 			return 0;
 		}
 		if (is_armored(buf, sizeof(buf))) {
-			read_ascii_armor_file(cursor, p);
+			rv = read_ascii_armor_file(cursor, p);
 		} else {
-			read_binary_file(pgp, "signature", "%s", (const char *)p);
+			rv = read_binary_file(pgp, "signature", "%s", (const char *)p);
 		}
 		fclose(fp);
 	} else {
 		if (is_armored(p, (size_t)size)) {
-			read_ascii_armor_memory(cursor, p, (size_t)size);
+			rv = read_ascii_armor_memory(cursor, p, (size_t)size);
 		} else {
-			read_binary_memory(pgp, "signature", p, (size_t)size);
+			rv = read_binary_memory(pgp, "signature", p, (size_t)size);
 		}
 	}
-	return 1;
+	return rv;
 }
 
 /* get the data and size from litdata packet */
@@ -2780,7 +2782,6 @@ pgpv_verify(pgpv_cursor_t *cursor, pgpv_
 		return 0;
 	}
 	if (!setup_data(cursor, pgp, p, size)) {
-		snprintf(cursor->why, sizeof(cursor->why), "No input data");
 		return 0;
 	}
 	if (ARRAY_COUNT(cursor->pgp->pkts) == ARRAY_LAST(cursor->pgp->datastarts) + 1) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Aug 28 15:52:22 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
Avoid segv when the end signature is not found!


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.10 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.11
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.10	Wed Jun 15 11:47:50 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Sun Aug 28 11:52:22 2016
@@ -2016,7 +2016,7 @@ read_ascii_armor(pgpv_cursor_t *cursor, 
 	litdata.s.data = p;
 	litdata.u.litdata.offset = (size_t)(p - mem->mem);
 	litdata.u.litdata.filename = (uint8_t *)strdup(filename);
-	if ((p = find_bin_string(datastart = p, mem->size - litdata.offset, SIGSTART, strlen(SIGSTART))) == NULL) {
+	if ((p = find_bin_string(datastart = p, mem->size - litdata.offset, SIGSTART, sizeof(SIGSTART) - 1)) == NULL) {
 		snprintf(cursor->why, sizeof(cursor->why),
 			"malformed armor - no sig - at %zu", (size_t)(p - mem->mem));
 		return 0;
@@ -2030,7 +2030,13 @@ read_ascii_armor(pgpv_cursor_t *cursor, 
 		return 0;
 	}
 	p += 2;
-	sigend = find_bin_string(p, mem->size, SIGEND, strlen(SIGEND));
+	sigend = find_bin_string(p, mem->size, SIGEND, sizeof(SIGEND) - 1);
+	if (sigend == NULL) {
+		snprintf(cursor->why, sizeof(cursor->why),
+			"malformed armor - no end sig - at %zu",
+			(size_t)(p - mem->mem));
+		return 0;
+	}
 	binsigsize = b64decode((char *)p, (size_t)(sigend - p), binsig, sizeof(binsig));
 
 	read_binary_memory(cursor->pgp, "signature", cons_onepass, 15);

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 28 16:34:40 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
CID 977755: Resource leaks.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.97 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.98
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.97	Sun Feb  7 00:03:36 2016
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Tue Jun 28 12:34:40 2016
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.97 2016/02/07 05:03:36 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.98 2016/06/28 16:34:40 christos Exp $");
 #endif
 
 #include 
@@ -1186,6 +1186,7 @@ netpgp_generate_key(netpgp_t *netpgp, ch
 	int 	 passc;
 	int 	 fd;
 	int 	 cc;
+	int			 rv = 0;
 
 	uid = NULL;
 	io = netpgp->io;
@@ -1212,13 +1213,13 @@ netpgp_generate_key(netpgp_t *netpgp, ch
 	netpgp_setvar(netpgp, "generated userid", [cc - 16]);
 	if (mkdir(dir, 0700) < 0) {
 		(void) fprintf(io->errs, "can't mkdir '%s'\n", dir);
-		return 0;
+		goto out;
 	}
 	(void) fprintf(io->errs, "netpgp: generated keys in directory %s\n", dir);
 	(void) snprintf(ringfile = filename, sizeof(filename), "%s/pubring.gpg", dir);
 	if (!appendkey(io, key, ringfile)) {
 		(void) fprintf(io->errs, "Cannot write pubkey to '%s'\n", ringfile);
-		return 0;
+		goto out;
 	}
 	if (netpgp->pubring != NULL) {
 		pgp_keyring_free(netpgp->pubring);
@@ -1230,7 +1231,7 @@ netpgp_generate_key(netpgp_t *netpgp, ch
 	}
 	if (fd < 0) {
 		(void) fprintf(io->errs, "can't append secring '%s'\n", ringfile);
-		return 0;
+		goto out;
 	}
 	/* get the passphrase */
 	if ((numtries = netpgp_getvar(netpgp, "numtries")) == NULL ||
@@ -1242,15 +1243,18 @@ netpgp_generate_key(netpgp_t *netpgp, ch
 	passc = find_passphrase(netpgp->passfp, [ID_OFFSET], passphrase, sizeof(passphrase), attempts);
 	if (!pgp_write_xfer_seckey(create, key, (uint8_t *)passphrase, (const unsigned)passc, noarmor)) {
 		(void) fprintf(io->errs, "Cannot write seckey\n");
-		return 0;
+		goto out1;
 	}
+	rv = 1;
+out1:
 	pgp_teardown_file_write(create, fd);
 	if (netpgp->secring != NULL) {
 		pgp_keyring_free(netpgp->secring);
 	}
+out:
 	pgp_keydata_free(key);
 	free(cp);
-	return 1;
+	return rv;
 }
 
 /* encrypt a file */

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Jun 15 20:34:28 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: main.c verify.h

Log Message:
Update netpgpverify to 20160617

Sync with changes in pkgsrc

+ don't assume a string is NUL-terminated - use fwrite(3) with a specific size


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.6 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.7
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.6	Fri Jan 30 18:58:59 2015
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c	Wed Jun 15 20:34:28 2016
@@ -49,10 +49,11 @@ ptime(int64_t secs)
 static void
 pentry(pgpv_t *pgp, int n, const char *modifiers)
 {
+	size_t	 cc;
 	char	*s;
 
-	pgpv_get_entry(pgp, (unsigned)n, , modifiers);
-	printf("%s", s);
+	cc = pgpv_get_entry(pgp, (unsigned)n, , modifiers);
+	fwrite(s, 1, cc, stdout);
 	free(s);
 }
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.9
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.8	Wed Jun 15 16:51:46 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Wed Jun 15 20:34:28 2016
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_	20160616
+#define NETPGP_VERIFY_H_	20160617
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160616"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160617"
 
 #include 
 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Jun 15 16:51:46 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
Makefile.in verify.h
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: version.asc

Log Message:
Update netpgpverify to 20160616:

+ Bring over change from pkgsrc to add version.asc signature verification
to complement the noversion.asc cleartext signatures

+ Update version to 20160616


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.5 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.6
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.5	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Wed Jun 15 16:51:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.5 2016/06/14 20:47:08 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.6 2016/06/15 16:51:46 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,5 +43,7 @@ tst:
 	rm -f 1keytest.gpg
 	@echo "testing signing with a subkey"
 	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+	@echo "testing signatures with version"
+	./${PROG} -k pubring.gpg version.asc
 	@echo "testing signatures with no version"
 	./${PROG} -k pubring.gpg noversion.asc

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.9	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in	Wed Jun 15 16:51:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.9 2016/06/14 20:47:08 agc Exp $
+# $NetBSD: Makefile.in,v 1.10 2016/06/15 16:51:46 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,6 +43,8 @@ tst:
 	rm -f 1keytest.gpg
 	@echo "testing signing with a subkey"
 	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+	@echo "testing signatures with version"
+	./${PROG} -k pubring.gpg version.asc
 	@echo "testing signatures with no version"
 	./${PROG} -k pubring.gpg noversion.asc
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.7 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.8
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.7	Wed Jun 15 03:37:50 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Wed Jun 15 16:51:46 2016
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_	20160615
+#define NETPGP_VERIFY_H_	20160616
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160615"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160616"
 
 #include 
 

Added files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc:1.1
--- /dev/null	Wed Jun 15 16:51:46 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc	Wed Jun 15 16:51:46 2016
@@ -0,0 +1,15 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA1
+
+bar
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQEcBAEBAgAGBQJXYOg1AAoJEBto3PzAWWgjN7wIALbMScFoVnkE47+Hj1aLclRL
+9Mb9bKWkPi9iq1SybDEeiK6G9hLXSm2ZbygHNoAwFVlMIxkV2lRKqLfquatW9GH/
+9W2LkKa3wYpHH84Uj2/3Atu7564+IvcvDVkuxp4oHiz4X3i4CvIOf6qPuPHC5fAb
+xmjRLJRh71pJ8zBdtLQV3hnzjuUk5qZvKt109/WARQL5lL5jGIe504TnzHEBSgNa
+Ez1vxN2RngVh4QhDApx05EYfmZnBChXalCCh+noo6gpjUN/xhfq/KkLWrLaRWIL6
+IHBS3MgqDP6ToaJ7R2w1hytCoKlbXGyJGsUn29QBoQBwWGGM3Z5pbFBPcmBx/mg=
+=KXon
+-END PGP SIGNATURE-

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Jun 15 15:47:50 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
Mark obuf_printf as printf-like.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.9	Wed Jun 15 03:37:50 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Wed Jun 15 15:47:50 2016
@@ -211,6 +211,7 @@ obuf_add_mem(obuf_t *obuf, const char *s
 }
 
 /* varargs-based printf to string */
+__printflike(2, 3)
 static bool
 obuf_printf(obuf_t *obuf, const char *fmt, ...)
 {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Jun 15 03:37:50 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c
verify.h

Log Message:
netpgpverify: bring over changes in 20160615 from pkgsrc

+ perform check for start of ascii-armoured signature in a more efficient
way


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.9
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.8	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Wed Jun 15 03:37:50 2016
@@ -2021,18 +2021,14 @@ read_ascii_armor(pgpv_cursor_t *cursor, 
 		return 0;
 	}
 	litdata.u.litdata.len = litdata.s.size = (size_t)(p - datastart);
-	p += strlen(SIGSTART);
-	/* Work out whther there's a version line */
-	if (memcmp(p, "Version:", 8) == 0) {
-		if ((p = find_bin_string(p, mem->size, "\n\n",  2)) == NULL) {
-			snprintf(cursor->why, sizeof(cursor->why),
-"malformed armed signature at %zu", (size_t)(p - mem->mem));
-			return 0;
-		}
-		p += 2;
-	} else {
-		p += 1;
+	/* this puts p at the newline character, so it will find \n\n if no version */
+	p += strlen(SIGSTART) - 1;
+	if ((p = find_bin_string(p, mem->size, "\n\n",  2)) == NULL) {
+		snprintf(cursor->why, sizeof(cursor->why),
+			"malformed armed signature at %zu", (size_t)(p - mem->mem));
+		return 0;
 	}
+	p += 2;
 	sigend = find_bin_string(p, mem->size, SIGEND, strlen(SIGEND));
 	binsigsize = b64decode((char *)p, (size_t)(sigend - p), binsig, sizeof(binsig));
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.6 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.7
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.6	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Wed Jun 15 03:37:50 2016
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012,2013,2014,2015 Alistair Crooks 
+ * Copyright (c) 2012,2013,2014,2015,2016 Alistair Crooks 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_	20160614
+#define NETPGP_VERIFY_H_	20160615
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160614"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160615"
 
 #include 
 

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Jun 14 20:47:43 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
add test for signatures produced by gpg --no-emit-version


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.13 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.14
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.13	Fri Dec  5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Tue Jun 14 20:47:43 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2014/12/05 04:42:36 agc Exp $
+#	$NetBSD: Makefile,v 1.14 2016/06/14 20:47:43 agc Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -36,3 +36,5 @@ t tst: ${PROG}
 	./${PROG} -S ${EXTDIST}/src/netpgpverify/sshtest-20140202.pub ${EXTDIST}/src/netpgpverify/data.sig
 	@echo "expected failure, to check bad signatures fail to verify"
 	-sed -e 's|A|B|' ${EXTDIST}/src/netpgpverify/data.gpg | ./${PROG} -S ${EXTDIST}/src/netpgpverify/sshtest-20140202.pub 
+	@echo "testing signatures with no version"
+	./${PROG} -k ${EXTDIST}/src/netpgpverify/pubring.gpg ${EXTDIST}/src/netpgpverify/noversion.asc

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Jun 14 20:55:00 UTC 2016

Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: noversion.asc

Log Message:
add file used for testing gpg --emit-no-version case


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/noversion.asc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/noversion.asc
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/netpgpverify/noversion.asc:1.1
--- /dev/null	Tue Jun 14 20:55:00 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/noversion.asc	Tue Jun 14 20:55:00 2016
@@ -0,0 +1,14 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA1
+
+bar
+-BEGIN PGP SIGNATURE-
+
+iQEcBAEBAgAGBQJXYEJcAAoJEBto3PzAWWgjk5cH/03A4/a+ywsnzZMncQ7H7rtu
+QiIWwyiJo28Xf5z3fL5WG6VKNJdPpx0TIthcxu0O1YgF6lvqqQbnNpfNbD+1h88+
+JCcqJfyVk38vsFPxdFTIOWjbEtHs9yyjUVk5tJQrxtTaSJbGtQIMHQXXfWAyKCn4
+0Zl+E2iWb6tXxxMaAkrCOipjC9knuTJJbG6oVZpujp7jOt+2bOWY+89+FhoGJ5tv
+XiOvqIUUSW5Iua+wBOmhb/iuNFUVrO8rS/7BpMLQmxbnLxWtwwSWIcyyg6BwiIvm
+8K5NmD3WKN97tPA1HYjk76SlLj254OVLDmTZua7ljqasl5PR9W+aUFIByDgQrGE=
+=90+m
+-END PGP SIGNATURE-

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Jun 14 20:47:08 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
Makefile.in bignum.c bn.h bzlib.c digest.c digest.h libverify.c
md5.h md5c.c misc.c pgpsum.c rmd160.c rmd160.h rsa.c rsa.h sha1.c
sha1.h sha2.c sha2.h tiger.c tiger.h verify.h

Log Message:
Sync with pkgsrc sources as of version 20160614

+ pick up renaming changes to internal routines
+ fix for issue verifying signatures created by gpg --no-emit-version
+ add test for same


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bignum.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bn.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/md5.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/md5c.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.4	Thu Feb  5 01:26:54 2015
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Tue Jun 14 20:47:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.4 2015/02/05 01:26:54 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.5 2016/06/14 20:47:08 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,3 +43,5 @@ tst:
 	rm -f 1keytest.gpg
 	@echo "testing signing with a subkey"
 	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+	@echo "testing signatures with no version"
+	./${PROG} -k pubring.gpg noversion.asc

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.9
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.8	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in	Tue Jun 14 20:47:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.8 2014/03/09 00:15:45 agc Exp $
+# $NetBSD: Makefile.in,v 1.9 2016/06/14 20:47:08 agc Exp $
 
 PROG=netpgpverify
 
@@ -26,8 +26,25 @@ tst:
 	./${PROG} -k pubring.gpg NetBSD-6.0_RC1_hashes.asc
 	./${PROG} -k pubring.gpg NetBSD-6.0_RC1_hashes.gpg
 	./${PROG} -v
-	./${PROG} -S testkey.pub data.gpg
-	./${PROG} -S testkey.pub data.sig
+	./${PROG} -S sshtest-20140202.pub data.gpg
+	./${PROG} -S sshtest-20140202.pub data.sig
+	@echo "expected failure, to check bad signatures fail to verify"
+	-sed -e 's|A|B|' data.gpg | ./${PROG} -S sshtest-20140202.pub
+	@echo ""
+	@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 > /dev/null
+	@echo "dumping ssh now"
+	./${PROG} -c dump -S sshtest-20140202.pub data.gpg
+	@echo "testing pubring with one key"
+	uudecode 1keytest.gpg.uu
+	./${PROG} -k 1keypubring.gpg 1keytest.gpg
+	rm -f 1keytest.gpg
+	@echo "testing signing with a subkey"
+	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+	@echo "testing signatures with no version"
+	./${PROG} -k pubring.gpg noversion.asc
 
 clean:
 	rm -rf *.core ${OBJS} ${PROG}

Index: 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Feb  7 05:03:36 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
Fix signing of in-memory data with SSH keys


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.96 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.97
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.96	Wed Feb 22 06:58:54 2012
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Sun Feb  7 05:03:36 2016
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.96 2012/02/22 06:58:54 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.97 2016/02/07 05:03:36 agc Exp $");
 #endif
 
 #include 
@@ -1501,10 +1501,17 @@ netpgp_sign_memory(netpgp_t *netpgp,
 	>key.pubkey, 0);
 			}
 		}
-		/* now decrypt key */
-		seckey = pgp_decrypt_seckey(keypair, netpgp->passfp);
-		if (seckey == NULL) {
-			(void) fprintf(io->errs, "Bad passphrase\n");
+		if (netpgp_getvar(netpgp, "ssh keys") == NULL) {
+			/* now decrypt key */
+			seckey = pgp_decrypt_seckey(keypair, netpgp->passfp);
+			if (seckey == NULL) {
+(void) fprintf(io->errs, "Bad passphrase\n");
+			}
+		} else {
+			pgp_keyring_t	*secring;
+
+			secring = netpgp->secring;
+			seckey = >keys[0].key.seckey;
 		}
 	}
 	if (seckey == NULL) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Thu Feb  5 01:26:54 UTC 2015

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
bzlib.c bzlib_private.h chk.sh libnetpgpverify.3 libverify.c
verify.h zlib.c
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: 1keypubring.gpg
1keysecring.gpg 1keytest.gpg.uu digest-20121220.tgz
joyent-pubring.gpg mkdist testit.sh

Log Message:
Sync the src version of netpgpverify with the version in pkgsrc

 
 revision 1.10
 date: 2015-02-04 16:58:02 -0800;  author: agc;  state: Exp;  lines: +1 -0;  
 commitid: 0v3HoBPFTnhDSK8y;
 appease compiler warning police - initialise a variable in case it's otherwise
 used uninitialised. ride previous version bump.
 
 revision 1.9
 date: 2015-02-04 16:21:57 -0800;  author: agc;  state: Exp;  lines: +48 -21;  
 commitid: ElUADrlljB46GK8y;
 Update netpgpverify (and libnetpgpverify) to version 20150205

 + recognise signatures made by subkeys as well as by primary keys

 + print out the relevant key which signed the file, even if it's
 a subkey and not the primary key itself.

 + keep the same API as before

 with many thanks to Jonathan Perkin
 
 revision 1.8
 date: 2015-02-03 13:34:57 -0800;  author: agc;  state: Exp;  lines: +1 -3;  
 commitid: 6qTclEbv7hmZMB8y;
 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
 
 revision 1.7
 date: 2015-02-03 13:13:17 -0800;  author: agc;  state: Exp;  lines: +3 -0;  
 commitid: ztXbqAi9ocXGFB8y;
 Update netpgpverify, and libnetpgpverify, to 20150203

 + portability fixes to make netpgpverify build on freebsd 10.1 with WARNS=5

 + fixed an oversight in the testit.sh script


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/1keypubring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/1keysecring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/1keytest.gpg.uu \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest-20121220.tgz \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/joyent-pubring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/mkdist \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/testit.sh
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.3	Fri Jan 30 18:58:59 2015
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Thu Feb  5 01:26:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.3 2015/01/30 18:58:59 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.4 2015/02/05 01:26:54 agc Exp $
 
 PROG=netpgpverify
 
@@ -34,6 +34,12 @@ 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
+	uudecode 1keytest.gpg.uu
+	./${PROG} -k 1keypubring.gpg 1keytest.gpg
+	rm -f 1keytest.gpg
+	@echo testing signing with a subkey
+	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.2	Sun Mar  9 07:01:42 2014
+++ 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Fri Jan 30 18:58:59 UTC 2015

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
chk.sh libverify.c main.c misc.c misc.h netpgpverify.1 verify.h

Log Message:
catch up with pkgsrc, update netpgpverify to 20150115:

+ add '-c dump' command to do a packet dump of the input


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.2	Fri Dec  5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Fri Jan 30 18:58:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.2 2014/12/05 04:42:36 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.3 2015/01/30 18:58:59 agc Exp $
 
 PROG=netpgpverify
 
@@ -30,3 +30,10 @@ tst:
 	./${PROG} -S sshtest-20140202.pub data.sig
 	@echo expected failure, to check bad signatures fail to verify
 	-sed -e 's|A|B|' data.gpg | ./${PROG} -S sshtest-20140202.pub 
+	@echo 
+	@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
+	@echo dumping ssh now
+	./${PROG} -c dump -S sshtest-20140202.pub data.gpg
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.2	Fri Dec  5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c	Fri Jan 30 18:58:59 2015
@@ -65,3 +65,48 @@ netpgp_deallocate(void *ptr, size_t size
 	free(ptr);
 #endif
 }
+
+#define HEXDUMP_LINELEN	16
+
+#ifndef PRIsize
+#define PRIsize	z
+#endif
+
+/* show hexadecimal/ascii dump */
+ssize_t 
+netpgp_hexdump(const void *vin, const size_t len, void *outvp, size_t size)
+{
+	const char	*in = (const char *)vin;
+	size_t		 i;
+	char		 line[HEXDUMP_LINELEN + 1];
+	char		*out = (char *)outvp;
+	int		 o;
+
+	for (i = 0, o = 0 ; i  len ; i++) {
+		if (i % HEXDUMP_LINELEN == 0) {
+			o += snprintf(out[o], size - o,
+	%.5 PRIsize u |  , i);
+		} else if (i % (HEXDUMP_LINELEN / 2) == 0) {
+			o += snprintf(out[o], size - o,  );
+		}
+		o += snprintf(out[o], size - o, %.02x , (uint8_t)in[i]);
+		line[i % HEXDUMP_LINELEN] =
+			(isprint((uint8_t)in[i])) ? in[i] : '.';
+		if (i % HEXDUMP_LINELEN == HEXDUMP_LINELEN - 1) {
+			line[HEXDUMP_LINELEN] = 0x0;
+			o += snprintf(out[o], size - o,  | %s\n, line);
+		}
+	}
+	if (i % HEXDUMP_LINELEN != 0) {
+		for ( ; i % HEXDUMP_LINELEN != 0 ; i++) {
+			o += snprintf(out[o], size - o,);
+			if (i % (HEXDUMP_LINELEN / 2) == 0) {
+o += snprintf(out[o], size - o,  );
+			}
+			line[i % HEXDUMP_LINELEN] = ' ';
+		}
+		line[HEXDUMP_LINELEN] = 0x0;
+		o += snprintf(out[o], size - o,  | %s\n, line);
+	}
+	return (ssize_t)o;
+}

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh	Fri Jan 30 18:58:59 2015
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-# $NetBSD: chk.sh,v 1.1 2014/03/09 00:15:45 agc Exp $
+# $NetBSD: chk.sh,v 1.2 2015/01/30 18:58:59 agc Exp $
 
-# Copyright (c) 2013,2014 Alistair Crooks a...@netbsd.org
+# Copyright (c) 2013,2014,2015 Alistair Crooks a...@netbsd.org
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,10 @@ die() {
 os=EdgeBSD
 osrev=6
 arch=amd64
-pkgsrc=pkgsrc-2013Q2
-keyring=
+pkgsrc=pkgsrc-2013Q1
 while [ $# -gt 0 ]; do
 	case $1 in
 	--arch|-a)	arch=$2; shift ;;
-	--keyring|-k)	keyring=$2; shift ;;
 	--os|-o)	os=$2; shift ;;
 	--pkgsrc)	pkgsrc=$2; shift ;;
 	-v)		set -x ;;
@@ 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Dec 17 16:50:52 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c

Log Message:
Fix bug report from Jared - actually print the key when exporting


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.25 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.26
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.25	Wed Feb 22 06:58:55 2012
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c	Wed Dec 17 16:50:52 2014
@@ -196,6 +196,7 @@ static int
 netpgp_cmd(netpgp_t *netpgp, prog_t *p, char *f)
 {
 	char	*key;
+	char	*s;
 
 	switch (p-cmd) {
 	case LIST_KEYS:
@@ -211,8 +212,10 @@ netpgp_cmd(netpgp_t *netpgp, prog_t *p, 
 			key = netpgp_getvar(netpgp, userid);
 		}
 		if (key) {
-			printf(%s, key);
-			return 1;
+			if ((s = netpgp_export_key(netpgp, key)) != NULL) {
+printf(%s, s);
+return 1;
+			}
 		}
 		(void) fprintf(stderr, key '%s' not found\n, f);
 		return 0;

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Fri Dec  5 04:42:36 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
libnetpgpverify.3 libverify.c main.c misc.c misc.h rsa.c verify.h
src/crypto/external/bsd/netpgp/lib/verify: Makefile
Added Files:
src/crypto/external/bsd/netpgp/lib/verify: config.h

Log Message:
Bring over the 20141204 portable version of netpgpverify from pkgsrc

+ Remove unused logmessage helper function

+ Add pgpv_get_cursor_element for easier manipulation of results
returned.

+ libnetpgpverify(3) man page improvements

+ Standardise on WARNS=5 settings (6 is too intrusive and distracting)

+ Also install the library and header file for netpgpverify.  This
allows scripting languages to use the same verification methods via a
shared library, rather than being forced to exec the netpgpverify(1)
command line utility.

+ libnetpgpverify is now a standalone library, and requires no
pre-requsisite libraries to function


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/lib/verify/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.12 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.13
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.12	Thu Mar 13 12:54:49 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Fri Dec  5 04:42:36 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2014/03/13 12:54:49 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2014/12/05 04:42:36 agc Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -20,7 +20,7 @@ LDFLAGS+=-g -O0
 .endif
 
 MAN=	netpgpverify.1
-WARNS=	4
+WARNS=	5
 
 EXTDIST=${.CURDIR}/../../dist
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Fri Dec  5 04:42:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.1 2014/03/09 00:15:45 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.2 2014/12/05 04:42:36 agc Exp $
 
 PROG=netpgpverify
 
@@ -18,7 +18,7 @@ LDFLAGS+=-g -O0
 .endif
 
 MAN=	netpgpverify.1
-WARNS=	6
+WARNS=	5
 
 .include bsd.prog.mk
 
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3	Fri Dec  5 04:42:36 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: libnetpgpverify.3,v 1.1 2014/03/09 00:15:45 agc Exp $
+.\ $NetBSD: libnetpgpverify.3,v 1.2 2014/12/05 04:42:36 agc Exp $
 .\
 .\ Copyright (c) 2014 Alistair Crooks a...@netbsd.org
 .\ All rights reserved.
@@ -23,7 +23,7 @@
 .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd February 16, 2014
+.Dd December 4, 2014
 .Dt LIBNETPGPVERIFY 3
 .Os
 .Sh NAME
@@ -32,7 +32,7 @@
 .Sh LIBRARY
 .Lb libnetpgpverify
 .Sh SYNOPSIS
-.In netpgpverify.h
+.In netpgp/verify.h
 .Ft int
 .Fo pgpv_read_pubring
 .Fa pgpv_t *pgp const void *keyring ssize_t size
@@ -47,11 +47,15 @@
 .Fc
 .Ft size_t
 .Fo pgpv_get_verified
-.Fa pgpv_cursor_t *cursor size_t cookie  char **ret
+.Fa pgpv_cursor_t *cursor size_t cookie char **ret
+.Fc
+.Ft size_t
+.Fo pgpv_get_cursor_element
+.Fa pgpv_cursor_t *cursor size_t element
 .Fc
 .Ft size_t
 .Fo pgpv_get_entry
-.Fa pgpv_t *pgp unsigned ent char **ret
+.Fa pgpv_t *pgp unsigned ent char **ret const char 

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Fri Dec  5 04:52:02 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp: Makefile
src/crypto/external/bsd/netpgp/bin/hkpc: Makefile
src/crypto/external/bsd/netpgp/bin/hkpd: Makefile
src/crypto/external/bsd/netpgp/bin/netpgp: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpkeys: Makefile
src/crypto/external/bsd/netpgp/lib: Makefile
Added Files:
src/crypto/external/bsd/netpgp/lib/netpgp: Makefile config.h
shlib_version

Log Message:
set up the netpgp lib directory hierarchy a bit more logically

+ move libnetpgp to the same level as libnetpgpverify

+ fix up all paths to the new directory structure


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile \
src/crypto/external/bsd/netpgp/lib/netpgp/config.h \
src/crypto/external/bsd/netpgp/lib/netpgp/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/Makefile:1.8 src/crypto/external/bsd/netpgp/Makefile:1.9
--- src/crypto/external/bsd/netpgp/Makefile:1.8	Sun Mar  9 00:39:31 2014
+++ src/crypto/external/bsd/netpgp/Makefile	Fri Dec  5 04:52:01 2014
@@ -1,7 +1,6 @@
-#	$NetBSD: Makefile,v 1.8 2014/03/09 00:39:31 agc Exp $
+#	$NetBSD: Makefile,v 1.9 2014/12/05 04:52:01 agc Exp $
 
 SUBDIR+=	libmj .WAIT
-SUBDIR+=	lib/verify .WAIT
 SUBDIR+=	lib .WAIT
 SUBDIR+=	bin
 

Index: src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.2 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.3
--- src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.2	Sun Mar  9 00:39:31 2014
+++ src/crypto/external/bsd/netpgp/bin/hkpc/Makefile	Fri Dec  5 04:52:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/09 00:39:31 agc Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/05 04:52:01 agc Exp $
 
 .include bsd.own.mk
 
@@ -6,7 +6,7 @@ PROG=hkpc
 BINDIR=/usr/bin
 SRCS=hkpc.c main.c
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp  ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

Index: src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.2 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.3
--- src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.2	Sun Mar  9 00:40:30 2014
+++ src/crypto/external/bsd/netpgp/bin/hkpd/Makefile	Fri Dec  5 04:52:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/09 00:40:30 agc Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/05 04:52:01 agc Exp $
 
 .include bsd.own.mk
 
@@ -6,7 +6,7 @@ PROG=hkpd
 BINDIR=/usr/sbin
 SRCS=hkpd.c main.c
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp  ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

Index: src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.2 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.3
--- src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.2	Sun Mar  9 00:24:47 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgp/Makefile	Fri Dec  5 04:52:01 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $
+#	$NetBSD: Makefile,v 1.3 2014/12/05 04:52:01 agc Exp $
 
 .include bsd.own.mk
 
@@ -7,7 +7,7 @@ BINDIR=		/usr/bin
 
 CPPFLAGS+=	-I${EXTDIST}/include
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp  ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

Index: src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile:1.2 src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile:1.3
--- src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile:1.2	Sun Mar  9 00:33:50 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile	Fri Dec  5 04:52:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2014/03/09 00:33:50 agc Exp $
+#	$NetBSD: Makefile,v 1.3 2014/12/05 04:52:02 agc Exp $
 
 .include bsd.own.mk
 
@@ -6,7 +6,7 @@ PROG=		netpgpkeys
 SRCS=		netpgpkeys.c
 BINDIR=		/usr/bin
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp  

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sat Nov 29 20:18:44 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: tiger.c verify.h
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: verify.c

Log Message:
Update netpgpverify to version 20141129

+ get rid of old libnetpgp-based source from /usr/src/crypto/external
tree, it's not been used in a while

+ enhancement to tiger.c (from apb, IIRC) to use the union rather than
dubious and probably unportable casts.

+ bump version number


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.15 -r0 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c	Sat Nov 29 20:18:44 2014
@@ -819,7 +819,7 @@ TIGER_Update(TIGER_CTX *ctx, const void 
 	for (; j  56; j++) {
 		u.temp8[j] = 0;
 	}
-	((uint64_t *)(void *)((u.temp8[56])))[0] = ((uint64_t)length)  3;
+	u.temp64[7] = ((uint64_t)length)  3;
 	tiger_compress(u.temp64, ctx-ctx);
 }
 
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Sat Nov 29 20:18:44 2014
@@ -25,7 +25,7 @@
 #ifndef NETPGP_VERIFY_H_
 #define NETPGP_VERIFY_H_	20140304
 
-#define NETPGPVERIFY_VERSION	netpgpverify portable 20140304
+#define NETPGPVERIFY_VERSION	netpgpverify portable 20141129
 
 #include sys/types.h
 

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Mar 13 08:13:21 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
Older gcc does not support -Wno-format-literal


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.10 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.11
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.10	Wed Mar 12 06:38:56 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Thu Mar 13 08:13:21 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2014/03/12 06:38:56 agc Exp $
+#	$NetBSD: Makefile,v 1.11 2014/03/13 08:13:21 martin Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -12,7 +12,9 @@ SRCS+= bzlib.c zlib.c
 SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
 
 CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
+.if !defined(HAVE_GCC) || ${HAVE_GCC} = 45
 COPTS.libverify.c+= -Wno-format-literal
+.endif
 
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Mar 13 12:54:49 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
It's nonliteral format strings it should not warn about.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.11 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.12
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.11	Thu Mar 13 08:13:21 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Thu Mar 13 12:54:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2014/03/13 08:13:21 martin Exp $
+#	$NetBSD: Makefile,v 1.12 2014/03/13 12:54:49 joerg Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -12,9 +12,7 @@ SRCS+= bzlib.c zlib.c
 SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
 
 CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
-.if !defined(HAVE_GCC) || ${HAVE_GCC} = 45
-COPTS.libverify.c+= -Wno-format-literal
-.endif
+COPTS.libverify.c+= -Wno-format-nonliteral
 
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Mar 12 06:38:56 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
Turn off literal format string warnings for one file

A better fix is coming


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.9 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.10
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.9	Mon Mar 10 17:00:53 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Wed Mar 12 06:38:56 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2014/03/10 17:00:53 agc Exp $
+#	$NetBSD: Makefile,v 1.10 2014/03/12 06:38:56 agc Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -12,6 +12,7 @@ SRCS+= bzlib.c zlib.c
 SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
 
 CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
+COPTS.libverify.c+= -Wno-format-literal
 
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Mar 11 17:20:23 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib_private.h

Log Message:
Mark assertion handler as dead.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h	Tue Mar 11 17:20:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib_private.h,v 1.1 2014/03/09 00:15:45 agc Exp $	*/
+/*	$NetBSD: bzlib_private.h,v 1.2 2014/03/11 17:20:23 joerg Exp $	*/
 
 
 /*-*/
@@ -57,7 +57,7 @@ typedef unsigned short  UInt16;
 
 #ifndef BZ_NO_STDIO
 
-void BZ2_bz__AssertH__fail ( int errcode );
+void BZ2_bz__AssertH__fail ( int errcode ) __dead;
 #define AssertH(cond,errcode) \
{ if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Mar 11 17:21:05 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c
misc.h

Log Message:
Annotate format strings. Remove string constant in front of real format
string.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Tue Mar 11 17:21:05 2014
@@ -151,7 +151,7 @@
 
 /* Forward declarations */
 static int read_all_packets(pgpv_t */*pgp*/, pgpv_mem_t */*mem*/, const char */*op*/);
-static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...);
+static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...) __printflike(3, 4);
 static int read_binary_memory(pgpv_t */*pgp*/, const char */*op*/, const void */*memory*/, size_t /*size*/);
 
 /* read a file into the pgpv_mem_t struct */
@@ -2221,7 +2221,7 @@ findstr(str_t *array, const char *name)
 }
 
 /* read public key from the ssh pubkey file */
-static int
+static __printflike(3, 4) int
 read_ssh_file(pgpv_t *pgp, pgpv_primarykey_t *primary, const char *fmt, ...)
 {
 	pgpv_signed_userid_t	 userid;
@@ -2690,7 +2690,7 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const
 		if (!read_ssh_file(pgp, primary, %s, keyring)) {
 			return 0;
 		}
-	} else if (!read_ssh_file(pgp, primary, pubring, %s/%s, nonnull_getenv(HOME), .ssh/id_rsa.pub)) {
+	} else if (!read_ssh_file(pgp, primary, %s/%s, nonnull_getenv(HOME), .ssh/id_rsa.pub)) {
 		return 0;
 	}
 	ARRAY_APPEND(pgp-primaries, primary);
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.1	Sun Mar  9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h	Tue Mar 11 17:21:05 2014
@@ -45,7 +45,7 @@ void *netpgp_allocate(size_t /*n*/, size
 void netpgp_deallocate(void */*ptr*/, size_t /*size*/);
 
 #ifndef _KERNEL
-void logmessage(const int /*level*/, const char */*fmt*/, ...);
+void logmessage(const int /*level*/, const char */*fmt*/, ...) __printflike(2, 3);
 #endif
 
 __END_DECLS

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Mar 11 17:38:48 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
cast arguments to the correct type for format strings


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2	Tue Mar 11 17:21:05 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Tue Mar 11 17:38:48 2014
@@ -1994,7 +1994,7 @@ setup_data(pgpv_cursor_t *cursor, pgpv_t
 		if (is_armored(buf, sizeof(buf))) {
 			read_ascii_armor_file(cursor, p);
 		} else {
-			read_binary_file(pgp, signature, %s, p);
+			read_binary_file(pgp, signature, %s, (const char *)p);
 		}
 		fclose(fp);
 	} else {
@@ -2672,7 +2672,7 @@ pgpv_read_pubring(pgpv_t *pgp, const voi
 	if (keyring) {
 		return (size  0) ?
 			read_binary_memory(pgp, pubring, keyring, (size_t)size) :
-			read_binary_file(pgp, pubring, %s, keyring);
+			read_binary_file(pgp, pubring, %s, (const char *)keyring);
 	}
 	return read_binary_file(pgp, pubring, %s/%s, nonnull_getenv(HOME), .gnupg/pubring.gpg);
 }
@@ -2687,7 +2687,7 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const
 		return 0;
 	}
 	if (keyring) {
-		if (!read_ssh_file(pgp, primary, %s, keyring)) {
+		if (!read_ssh_file(pgp, primary, %s, (const char *)keyring)) {
 			return 0;
 		}
 	} else if (!read_ssh_file(pgp, primary, %s/%s, nonnull_getenv(HOME), .ssh/id_rsa.pub)) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Mar 11 17:48:31 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
Add portability definitions in case they're not already defined

XXX - these need to be consolidated in one single header


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3	Tue Mar 11 17:38:48 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Tue Mar 11 17:48:31 2014
@@ -56,6 +56,14 @@
 #define USE_ARG(x)	/*LINTED*/(void)(x)
 #endif
 
+#ifndef __dead
+#define __dead__attribute__((__noreturn__))
+#endif
+
+#ifndef __printflike
+#define __printflike(n, m)		__attribute__((format(printf,n,m)))
+#endif
+
 #define BITS_TO_BYTES(b)		(((b) + (CHAR_BIT - 1)) / CHAR_BIT)
 
 /* packet types */

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Mon Mar 10 17:00:53 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
fix typo in previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.8 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.9
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.8	Sun Mar  9 07:00:52 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Mon Mar 10 17:00:53 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2014/03/09 07:00:52 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2014/03/10 17:00:53 agc Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -11,7 +11,7 @@ SRCS+= bzlib.c zlib.c
 
 SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
 
-CPPFLAGS+=-I${.CURDIR} ${EXTDIST}/src/netpgpverify
+CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
 
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:15:46 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/dist/src: Makefile.am
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in
main.c netpgpverify.1
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
Makefile.lib.in Makefile.libtool.in NetBSD-6.0_RC1_hashes.asc
NetBSD-6.0_RC1_hashes.gpg TODO array.h b64.c b64.h bignum.c bn.h
bufgap.c bufgap.h bzlib.c bzlib.h bzlib_private.h chk.sh configure
data data.gpg data.sig defs.h digest.c digest.h libnetpgpverify.3
libverify.c md5.h md5c.c misc.c misc.h pgpsum.c pgpsum.h
pubring.gpg rmd160.c rmd160.h rsa.c rsa.h sha1.c sha1.h sha2.c
sha2.h sshtest-20140202 sshtest-20140202.pub tiger.c tiger.h
verify.h zlib.c zlib.h

Log Message:
Bring over the standalone netpgpverify sources from
pkgsrc/security/netpgpverify.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/src/Makefile.am
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.lib.in \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.libtool.in \

src/crypto/external/bsd/netpgp/dist/src/netpgpverify/NetBSD-6.0_RC1_hashes.asc \

src/crypto/external/bsd/netpgp/dist/src/netpgpverify/NetBSD-6.0_RC1_hashes.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/TODO \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/array.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bignum.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bn.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bufgap.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bufgap.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/configure \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/data \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/data.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/data.sig \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/defs.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/md5.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/md5c.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pubring.gpg \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sshtest-20140202 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sshtest-20140202.pub \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the 

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:17:28 UTC 2014

Added Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: config.h

Log Message:
Add the config.h file as part of the reachover infrastructure


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h:1.1
--- /dev/null	Sun Mar  9 00:17:28 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h	Sun Mar  9 00:17:28 2014
@@ -0,0 +1,12 @@
+#ifndef CONFIG_H_
+#define CONFIG_H_ 20140308
+
+#ifndef __UNCONST
+#define __UNCONST(a)   ((void *)(unsigned long)(const void *)(a))
+#endif /* __UNCONST */
+
+#ifndef USE_ARG
+#define USE_ARG(x)   /*LINTED*/(void)(x)
+#endif /* USE_ARG */
+
+#endif /* CONFIG_H_ */

CVS commit: src/crypto/external/bsd/netpgp/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:18:29 UTC 2014

Removed Files:
src/crypto/external/bsd/netpgp/netpgpverify: Makefile

Log Message:
Clean up the reachover infrastructure - the programs now live under the
bin subdirectory


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r0 src/crypto/external/bsd/netpgp/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:24:47 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin: Makefile
Added Files:
src/crypto/external/bsd/netpgp/bin/netpgp: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/netpgp: Makefile

Log Message:
Move the netpgp directory (for the executable) under the bin reachover
directory


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/bin/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/netpgp/netpgp/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.4 src/crypto/external/bsd/netpgp/bin/Makefile:1.5
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.4	Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/bin/Makefile	Sun Mar  9 00:24:47 2014
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2012/11/20 05:26:25 agc Exp $
+#	$NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
 
+SUBDIR+=	netpgp
 SUBDIR+=	netpgpverify
 
 .include bsd.subdir.mk

Added files:

Index: src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.2
--- /dev/null	Sun Mar  9 00:24:47 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgp/Makefile	Sun Mar  9 00:24:47 2014
@@ -0,0 +1,26 @@
+#	$NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $
+
+.include bsd.own.mk
+
+PROG=		netpgp
+BINDIR=		/usr/bin
+
+CPPFLAGS+=	-I${EXTDIST}/include
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../libmj  ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lcrypto -lz -lbz2
+DPADD+=		${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+MAN=		netpgp.1
+
+EXTDIST=	${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/netpgp
+
+.include bsd.prog.mk

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:27:54 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
Install the binary in the correct location


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.5 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.6
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.5	Sun Mar  9 00:15:46 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sun Mar  9 00:27:54 2014
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2014/03/09 00:15:46 agc Exp $
+#	$NetBSD: Makefile,v 1.6 2014/03/09 00:27:54 agc Exp $
 
 PROG=netpgpverify
+BINDIR=		/usr/bin
 
 SRCS= b64.c bignum.c bufgap.c digest.c
 SRCS+= libverify.c main.c misc.c

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:33:51 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp: Makefile
src/crypto/external/bsd/netpgp/bin: Makefile
src/crypto/external/bsd/netpgp/dist: configure configure.ac tst
src/crypto/external/bsd/netpgp/lib: Makefile
Added Files:
src/crypto/external/bsd/netpgp/bin/netpgpkeys: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/netpgpkeys: Makefile

Log Message:
Move netpgpkeys into the correct place in the reachover insfrastructure


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/bin/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/netpgp/dist/configure \
src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/netpgp/dist/tst
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/Makefile:1.6 src/crypto/external/bsd/netpgp/Makefile:1.7
--- src/crypto/external/bsd/netpgp/Makefile:1.6	Tue Nov 20 05:26:24 2012
+++ src/crypto/external/bsd/netpgp/Makefile	Sun Mar  9 00:33:50 2014
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.6 2012/11/20 05:26:24 agc Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/09 00:33:50 agc Exp $
 
-SUBDIR=		libmj .WAIT
+SUBDIR+=	libmj .WAIT
 SUBDIR+=	lib/verify .WAIT
 SUBDIR+=	lib .WAIT
-SUBDIR+=	netpgp netpgpkeys bin
+SUBDIR+=	bin
 #SUBDIR+=	hkpc hkpd
 
 .include bsd.subdir.mk

Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.5 src/crypto/external/bsd/netpgp/bin/Makefile:1.6
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.5	Sun Mar  9 00:24:47 2014
+++ src/crypto/external/bsd/netpgp/bin/Makefile	Sun Mar  9 00:33:50 2014
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
+#	$NetBSD: Makefile,v 1.6 2014/03/09 00:33:50 agc Exp $
 
 SUBDIR+=	netpgp
+SUBDIR+=	netpgpkeys
 SUBDIR+=	netpgpverify
 
 .include bsd.subdir.mk

Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.41 src/crypto/external/bsd/netpgp/dist/configure:1.42
--- src/crypto/external/bsd/netpgp/dist/configure:1.41	Fri Feb 21 01:55:10 2014
+++ src/crypto/external/bsd/netpgp/dist/configure	Sun Mar  9 00:33:50 2014
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.40 .
+# From configure.ac Revision: 1.41 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for netpgp 20140220.
 #
@@ -3191,7 +3191,6 @@ $as_echo no 6; }
   SET_MAKE=MAKE=${MAKE-make}
 fi
 
-AM_PROG_AR
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of $ac_prog, so it can be a program name with args.
@@ -4803,13 +4802,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface=BSD nm
   echo int some_variable = 0;  conftest.$ac_ext
-  (eval echo \\$as_me:4806: $ac_compile\ 5)
+  (eval echo \\$as_me:4805: $ac_compile\ 5)
   (eval $ac_compile 2conftest.err)
   cat conftest.err 5
-  (eval echo \\$as_me:4809: $NM \\\conftest.$ac_objext 5)
+  (eval echo \\$as_me:4808: $NM \\\conftest.$ac_objext 5)
   (eval $NM \conftest.$ac_objext\ 2conftest.err  conftest.out)
   cat conftest.err 5
-  (eval echo \\$as_me:4812: output\ 5)
+  (eval echo \\$as_me:4811: output\ 5)
   cat conftest.out 5
   if $GREP 'External.*some_variable' conftest.out  /dev/null; then
 lt_cv_nm_interface=MS dumpbin
@@ -6015,7 +6014,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6018 configure'  conftest.$ac_ext
+  echo '#line 6017 configure'  conftest.$ac_ext
   if { { eval echo \\$as_me\:${as_lineno-$LINENO}: \$ac_compile\; } 5
   (eval $ac_compile) 25
   ac_status=$?
@@ -7540,11 +7539,11 @@ else
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo \\$as_me:7543: $lt_compile\ 5)
+   (eval echo \\$as_me:7542: $lt_compile\ 5)
(eval $lt_compile 2conftest.err)
ac_status=$?
cat conftest.err 5
-   echo $as_me:7547: \$? = $ac_status 5
+   echo $as_me:7546: \$? = $ac_status 5
if (exit $ac_status)  test -s $ac_outfile; then
  # The compiler can only warn and ignore the option if not recognized
  # So say no if there are warnings other than the usual output.
@@ -7879,11 +7878,11 @@ else
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo 

CVS commit: src/crypto/external/bsd/netpgp

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:39:31 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp: Makefile
src/crypto/external/bsd/netpgp/bin: Makefile
Added Files:
src/crypto/external/bsd/netpgp/bin/hkpc: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/hkpd: Makefile

Log Message:
Move hkpc and hkpd into the correct place in the reachover insfrastructure


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/bin/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/netpgp/hkpd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/Makefile:1.7 src/crypto/external/bsd/netpgp/Makefile:1.8
--- src/crypto/external/bsd/netpgp/Makefile:1.7	Sun Mar  9 00:33:50 2014
+++ src/crypto/external/bsd/netpgp/Makefile	Sun Mar  9 00:39:31 2014
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/09 00:33:50 agc Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/09 00:39:31 agc Exp $
 
 SUBDIR+=	libmj .WAIT
 SUBDIR+=	lib/verify .WAIT
 SUBDIR+=	lib .WAIT
 SUBDIR+=	bin
-#SUBDIR+=	hkpc hkpd
 
 .include bsd.subdir.mk

Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.6 src/crypto/external/bsd/netpgp/bin/Makefile:1.7
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.6	Sun Mar  9 00:33:50 2014
+++ src/crypto/external/bsd/netpgp/bin/Makefile	Sun Mar  9 00:39:31 2014
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/09 00:33:50 agc Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/09 00:39:31 agc Exp $
 
 SUBDIR+=	netpgp
 SUBDIR+=	netpgpkeys
 SUBDIR+=	netpgpverify
+#SUBDIR+=	hkpc
+#SUBDIR+=	hkpd
 
 .include bsd.subdir.mk

Added files:

Index: src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.2
--- /dev/null	Sun Mar  9 00:39:31 2014
+++ src/crypto/external/bsd/netpgp/bin/hkpc/Makefile	Sun Mar  9 00:39:31 2014
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.2 2014/03/09 00:39:31 agc Exp $
+
+.include bsd.own.mk
+
+PROG=hkpc
+BINDIR=/usr/bin
+SRCS=hkpc.c main.c
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../libmj  ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lcrypto -lz -lbz2
+DPADD+=		${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+WARNS=0
+MAN=hkpc.1
+
+.PATH: ${.CURDIR}/../../dist/src/hkpclient
+
+.include bsd.prog.mk

CVS commit: src/crypto/external/bsd/netpgp/bin/hkpd

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:40:30 UTC 2014

Added Files:
src/crypto/external/bsd/netpgp/bin/hkpd: Makefile

Log Message:
Put hkpd in the right place in the reachover infrastructure


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.2
--- /dev/null	Sun Mar  9 00:40:30 2014
+++ src/crypto/external/bsd/netpgp/bin/hkpd/Makefile	Sun Mar  9 00:40:30 2014
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.2 2014/03/09 00:40:30 agc Exp $
+
+.include bsd.own.mk
+
+PROG=hkpd
+BINDIR=/usr/sbin
+SRCS=hkpd.c main.c
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib  ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../libmj  ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lcrypto -lz -lbz2
+DPADD+=		${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+MAN=hkpd.1
+
+.PATH: ${.CURDIR}/../../dist/src/hkpd
+
+.include bsd.prog.mk
+
+t: ${PROG}
+	./${PROG} -D 
+	sleep 1
+	ftp -o- 'http://localhost:11371/pks/lookup?op=indexsearch=agcoptions=json'
+	ftp -o- 'http://localhost:11371/pks/lookup?op=getsearch=agcoptions=json'
+	ftp -o- 'http://localhost:11371/pks/lookup?op=getsearch=agcoptions=mr'
+	pkill hkpd

CVS commit: src/crypto/external/bsd/netpgp/hkpc

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Sun Mar  9 00:41:42 UTC 2014

Removed Files:
src/crypto/external/bsd/netpgp/hkpc: Makefile

Log Message:
get rid of the old reachover directory


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/hkpc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar  9 06:57:58 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
proper include


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.6 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.7
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.6	Sat Mar  8 19:27:54 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sun Mar  9 01:57:58 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/09 00:27:54 agc Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/09 06:57:58 christos Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -11,7 +11,7 @@ SRCS+= bzlib.c zlib.c
 
 SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
 
-CPPFLAGS+=-I. ${EXTDIST}/src/netpgpverify
+CPPFLAGS+=-I${.CURDIR} ${EXTDIST}/src/netpgpverify
 
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0

CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar  9 07:00:52 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
WARNS=6 is impossible for this code :-)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.7 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.8
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.7	Sun Mar  9 01:57:58 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sun Mar  9 03:00:52 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/09 06:57:58 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/09 07:00:52 christos Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -19,7 +19,7 @@ LDFLAGS+=-g -O0
 .endif
 
 MAN=	netpgpverify.1
-WARNS=	6
+WARNS=	4
 
 EXTDIST=${.CURDIR}/../../dist
 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar  9 07:01:42 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib.c main.c

Log Message:
fix unused


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.1	Sat Mar  8 19:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c	Sun Mar  9 03:01:42 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $	*/
 
 
 /*-*/
@@ -35,7 +35,7 @@
 #include bzlib_private.h
 
 
-/*	$NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $	*/
 
 
 /*-*/
@@ -930,6 +930,8 @@ BZFILE * bzopen_or_bzdopen
intsmallMode = 0;
intnUnused   = 0; 
 
+   __USE(blockSize100k);
+
if (mode == NULL) return NULL;
while (*mode) {
   switch (*mode) {
@@ -1080,7 +1082,7 @@ const char * BZ_API(BZ2_bzerror) (BZFILE
 /*-*/
 /*--- end   bzlib.c ---*/
 /*-*/
-/*	$NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $	*/
 
 
 /*-*/
@@ -1726,7 +1728,7 @@ Int32 BZ2_decompress ( DState* s )
 /*-*/
 /*--- end  decompress.c ---*/
 /*-*/
-/*	$NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $	*/
 
 
 /*-*/
@@ -1830,7 +1832,7 @@ UInt32 BZ2_crc32Table[256] = {
 /*-*/
 /*--- endcrctable.c ---*/
 /*-*/
-/*	$NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $	*/
 
 
 /*-*/

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.3	Sat Mar  8 19:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c	Sun Mar  9 03:01:42 2014
@@ -122,7 +122,6 @@ verify_data(pgpv_t *pgp, const char *cmd
 int
 main(int argc, char **argv)
 {
-	const char	*modifiers;
 	const char	*keyring;
 	const char	*cmd;
 	ssize_t		 cc;
@@ -138,7 +137,6 @@ main(int argc, char **argv)
 	ssh = 0;
 	ok = 1;
 	cmd = verify;
-	modifiers = NULL;
 	while ((i = getopt(argc, argv, S:c:k:v)) != -1) {
 		switch(i) {
 		case 'S':

CVS commit: src/crypto/external/bsd/netpgp/dist/src/libverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Mar  4 17:29:06 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify: libverify.c

Log Message:
check the correct field in the structure in dsa_verify - pointed out by
joerg - thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.8 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.9
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.8	Fri Feb 21 01:55:10 2014
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c	Tue Mar  4 17:29:06 2014
@@ -1609,7 +1609,9 @@ verify_dsa_sig(uint8_t *calculated, unsi
 	BIGNUM		 *t1;
 	int		  ret;
 
-	if (pubkey[DSA_P].bn == NULL || pubkey[DSA_Q].bn == NULL || pubkey[DSA_G].bn == NULL) {
+	if (pubkey-bn[DSA_P].bn == NULL ||
+	pubkey-bn[DSA_Q].bn == NULL ||
+	pubkey-bn[DSA_G].bn == NULL) {
 		return 0;
 	}
 	M = W = t1 = NULL;

CVS commit: src/crypto/external/bsd/netpgp/dist

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Fri Feb 21 01:55:10 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist: configure configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: errors.h netpgpsdk.h
version.h
src/crypto/external/bsd/netpgp/dist/src/libbn: misc.h
src/crypto/external/bsd/netpgp/dist/src/libverify: libverify.c

Log Message:
Update to version 20140220

Changes from previous version:

+ portability fixes from xtraeme for his Linux distribution:
+ add search for ar(1) into autoconf
+ define __printflike if it's not already defined
+ fix missing asprintf (I fixed this differently)


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/netpgp/dist/configure \
src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/errors.h
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h
cvs rdiff -u -r1.46 -r1.47 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.40 src/crypto/external/bsd/netpgp/dist/configure:1.41
--- src/crypto/external/bsd/netpgp/dist/configure:1.40	Mon Feb 17 07:23:18 2014
+++ src/crypto/external/bsd/netpgp/dist/configure	Fri Feb 21 01:55:10 2014
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.40 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for netpgp 20140210.
+# Generated by GNU Autoconf 2.69 for netpgp 20140220.
 #
 # Report bugs to Alistair Crooks a...@netbsd.org c0596823.
 #
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='netpgp'
 PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20140210'
-PACKAGE_STRING='netpgp 20140210'
+PACKAGE_VERSION='20140220'
+PACKAGE_STRING='netpgp 20140220'
 PACKAGE_BUGREPORT='Alistair Crooks a...@netbsd.org c0596823'
 PACKAGE_URL=''
 
@@ -1451,7 +1451,7 @@ if test $ac_init_help = long; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures netpgp 20140210 to adapt to many kinds of systems.
+\`configure' configures netpgp 20140220 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1521,7 +1521,7 @@ fi
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of netpgp 20140210:;;
+ short | recursive ) echo Configuration of netpgp 20140220:;;
esac
   cat \_ACEOF
 
@@ -1623,7 +1623,7 @@ fi
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-netpgp configure 20140210
+netpgp configure 20140220
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2100,7 +2100,7 @@ cat config.log _ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by netpgp $as_me 20140210, which was
+It was created by netpgp $as_me 20140220, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2919,7 +2919,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='netpgp'
- VERSION='20140210'
+ VERSION='20140220'
 
 
 cat confdefs.h _ACEOF
@@ -3191,6 +3191,7 @@ $as_echo no 6; }
   SET_MAKE=MAKE=${MAKE-make}
 fi
 
+AM_PROG_AR
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of $ac_prog, so it can be a program name with args.
@@ -4802,13 +4803,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface=BSD nm
   echo int some_variable = 0;  conftest.$ac_ext
-  (eval echo \\$as_me:4805: $ac_compile\ 5)
+  (eval echo \\$as_me:4806: $ac_compile\ 5)
   (eval $ac_compile 2conftest.err)
   cat conftest.err 5
-  (eval echo \\$as_me:4808: $NM \\\conftest.$ac_objext 5)
+  (eval echo \\$as_me:4809: $NM \\\conftest.$ac_objext 5)
   (eval $NM \conftest.$ac_objext\ 2conftest.err  conftest.out)
   cat conftest.err 5
-  (eval echo \\$as_me:4811: output\ 5)
+  (eval echo \\$as_me:4812: output\ 5)
   cat conftest.out 5
   if $GREP 'External.*some_variable' conftest.out  /dev/null; then
 lt_cv_nm_interface=MS dumpbin
@@ -6014,7 +6015,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6017 configure'  conftest.$ac_ext
+  echo '#line 6018 configure'  conftest.$ac_ext
   if { { eval echo \\$as_me\:${as_lineno-$LINENO}: \$ac_compile\; } 5
   (eval $ac_compile) 25
   ac_status=$?
@@ -7539,11 

CVS commit: src/crypto/external/bsd/netpgp/dist

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Mon Feb 17 07:23:19 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist: configure
src/crypto/external/bsd/netpgp/dist/src/hkpclient: hkpc.1
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3
src/crypto/external/bsd/netpgp/dist/src/libbn: libnetpgpbn.3
src/crypto/external/bsd/netpgp/dist/src/libdigest: tiger.3
src/crypto/external/bsd/netpgp/dist/src/libmj: libmj.3
src/crypto/external/bsd/netpgp/dist/src/libverify: libnetpgpverify.3
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.1
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: netpgpverify.1
src/crypto/external/bsd/netpgp/dist/src/pgp2ssh: pgp2ssh.1

Log Message:
Manual page fixes from Anthony J. Bentley, with many thanks!

Addresses PR/48395


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.1
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.3
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/pgp2ssh.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.39 src/crypto/external/bsd/netpgp/dist/configure:1.40
--- src/crypto/external/bsd/netpgp/dist/configure:1.39	Mon Feb 17 06:38:07 2014
+++ src/crypto/external/bsd/netpgp/dist/configure	Mon Feb 17 07:23:18 2014
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.39 .
+# From configure.ac Revision: 1.40 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for netpgp 20140210.
 #

Index: src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.1
diff -u src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.1:1.2 src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.1:1.3
--- src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.1:1.2	Sat Jul 20 21:39:55 2013
+++ src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.1	Mon Feb 17 07:23:18 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: hkpc.1,v 1.2 2013/07/20 21:39:55 wiz Exp $
+.\ $NetBSD: hkpc.1,v 1.3 2014/02/17 07:23:18 agc Exp $
 .\
 .\ Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd September 1, 2010
+.Dd February 16, 2014
 .Dt HKPC 1
 .Os
 .Sh NAME
@@ -86,8 +86,7 @@ whilst the hostname defaults to
 .Pp
 The
 .Dv netpgp
-suite of libraries and commands provides a copnvenient client
-in
+suite of libraries and commands provides a convenient client in
 .Xr hkpd 1 .
 .Pp
 The information is sent to the server in the form of
@@ -111,9 +110,16 @@ Output will be printed on stdout.
 .Xr libmj 3 ,
 .Xr libnetpgp 3
 .Sh STANDARDS
-The
-.Nm
-utility is designed to conform to IETF RFC 4880.
+.Rs
+.%A J. Callas
+.%A L. Donnerhacke
+.%A H. Finney
+.%A D. Shaw
+.%A R. Thayer
+.%D November 2007
+.%R RFC 4880
+.%T OpenPGP Message Format
+.Re
 .Sh HISTORY
 The
 .Nm

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.15 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.16
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.15	Sat Jul 20 21:39:55 2013
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Mon Feb 17 07:23:18 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: libnetpgp.3,v 1.15 2013/07/20 21:39:55 wiz Exp $
+.\ $NetBSD: libnetpgp.3,v 1.16 2014/02/17 07:23:18 agc Exp $
 .\
 .\ Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd June 17, 2010
+.Dd February 16, 2014
 .Dt LIBNETPGP 3
 .Os
 .Sh NAME
@@ -184,14 +184,14 @@ If no public key ring file is set, initi
 in the
 .Pa .gnupg/pubring.gpg
 file in the user's home directory.
-Similarily, if no secret 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Mon Feb 17 07:39:20 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: crypto.c

Log Message:
Avoid a warning on Gentoo Linux about fwrite(3) -- their glibc
declares fwrite(3) with the warn_unused_result attribute, from Razvan
Cojocaru


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c:1.35 src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c:1.36
--- src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c:1.35	Sun Jan  2 18:13:10 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c	Mon Feb 17 07:39:19 2014
@@ -54,7 +54,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: crypto.c,v 1.35 2011/01/02 18:13:10 agc Exp $);
+__RCSID($NetBSD: crypto.c,v 1.36 2014/02/17 07:39:19 agc Exp $);
 #endif
 
 #include sys/types.h
@@ -286,8 +286,11 @@ write_parsed_cb(const pgp_packet_t *pkt,
 			puts(Skipping...);
 			cbinfo-printstate.skipping = 1;
 		}
-		fwrite(content-unarmoured_text.data, 1,
-		   content-unarmoured_text.length, stdout);
+		if (fwrite(content-unarmoured_text.data, 1,
+		   content-unarmoured_text.length, stdout) != content-unarmoured_text.length) {
+			fprintf(stderr, unable to write unarmoured text data\n);
+			cbinfo-printstate.skipping = 1;
+		}
 		break;
 
 	case PGP_PTAG_CT_PK_SESSION_KEY:

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Feb  4 01:46:39 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: ssh2pgp.c

Log Message:
When building up a PGP public key from an ssh key, do not use the key
file's mtime as the birthtime of the signature - rather, just zero
this value (the key birthtime is an inherent part of calculating the
key id)

This allows public key files to be copied to other file systems, machines
or directories, and still produce the same key id.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.22 src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.23
--- src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.22	Sat Jan  1 19:53:53 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c	Tue Feb  4 01:46:38 2014
@@ -276,7 +276,7 @@ pgp_ssh2pubkey(pgp_io_t *io, const char 
 	(void) memset(key, 0x0, sizeof(*key));
 	pubkey = key-key.seckey.pubkey;
 	pubkey-version = PGP_V4;
-	pubkey-birthtime = st.st_mtime;
+	pubkey-birthtime = 0;
 	/* get key type */
 	ok = 1;
 	switch (pubkey-alg = findstr(pkatypes, buf)) {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Jan  6 21:12:19 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: errors.h netpgpsdk.h

Log Message:
Add __printflike where necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/dist/src/lib/errors.h
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/errors.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/errors.h:1.7 src/crypto/external/bsd/netpgp/dist/src/lib/errors.h:1.8
--- src/crypto/external/bsd/netpgp/dist/src/lib/errors.h:1.7	Mon Mar  5 02:20:18 2012
+++ src/crypto/external/bsd/netpgp/dist/src/lib/errors.h	Mon Jan  6 21:12:19 2014
@@ -135,7 +135,7 @@ const char *pgp_errcode(const pgp_er
 void 
 pgp_push_error(pgp_error_t **, pgp_errcode_t,
 		int,
-		const char *, int, const char *,...);
+		const char *, int, const char *,...) __printflike(6, 7);
 void pgp_print_error(pgp_error_t *);
 void pgp_print_errors(pgp_error_t *);
 void pgp_free_errors(pgp_error_t *);

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h:1.10 src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h:1.11
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h:1.10	Sun Nov  7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h	Mon Jan  6 21:12:19 2014
@@ -63,9 +63,9 @@ unsigned   pgp_check_sig(const uint8_t *
 
 const char *pgp_get_info(const char *type);
 
-int pgp_asprintf(char **, const char *, ...);
+int pgp_asprintf(char **, const char *, ...) __printflike(2, 3);
 
-void netpgp_log(const char *, ...);
+void netpgp_log(const char *, ...) __printflike(1, 2);
 
 int netpgp_strcasecmp(const char *, const char *);
 char *netpgp_strdup(const char *);

CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Jan  6 21:15:15 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libbn: misc.h
src/crypto/external/bsd/netpgp/dist/src/libverify: libverify.c

Log Message:
Add __printflike.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h
diff -u src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h:1.2 src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h:1.3
--- src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h:1.2	Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libbn/misc.h	Mon Jan  6 21:15:15 2014
@@ -45,7 +45,8 @@ void *netpgp_allocate(size_t /*n*/, size
 void netpgp_deallocate(void */*ptr*/, size_t /*size*/);
 
 #ifndef _KERNEL
-void logmessage(const int /*level*/, const char */*fmt*/, ...);
+void logmessage(const int /*level*/, const char */*fmt*/, ...)
+__printflike(2, 3);
 #endif
 
 __END_DECLS

Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.4 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.4	Thu Nov 22 11:26:28 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c	Mon Jan  6 21:15:15 2014
@@ -2046,7 +2046,7 @@ read_all_packets(pgpv_t *pgp, pgpv_mem_t
 }
 
 /* create a filename, read it, and then parse according to op */
-static int
+__printflike(3, 4) static int
 read_binary_file(pgpv_t *pgp, const char *op, const char *fmt, ...)
 {
 	va_list	args;

CVS commit: src/crypto/external/bsd/netpgp/dist/src/libverify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Jan  6 22:59:10 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify: libverify.c

Log Message:
Move __printflike to the prototype. Add explicit cast for void * -
char * to make GCC happy.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.5 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.6
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.5	Mon Jan  6 21:15:15 2014
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c	Mon Jan  6 22:59:10 2014
@@ -145,7 +145,8 @@
 
 /* Forward declarations */
 static int read_all_packets(pgpv_t */*pgp*/, pgpv_mem_t */*mem*/, const char */*op*/);
-static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...);
+static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...)
+__printflike(3, 4);
 static int read_binary_memory(pgpv_t */*pgp*/, const char */*op*/, const void */*memory*/, size_t /*size*/);
 static int pgpv_find_keyid(pgpv_t */*pgp*/, const char */*strkeyid*/, uint8_t */*keyid*/);
 
@@ -2046,7 +2047,7 @@ read_all_packets(pgpv_t *pgp, pgpv_mem_t
 }
 
 /* create a filename, read it, and then parse according to op */
-__printflike(3, 4) static int
+static int
 read_binary_file(pgpv_t *pgp, const char *op, const char *fmt, ...)
 {
 	va_list	args;
@@ -2335,7 +2336,7 @@ pgpv_read_pubring(pgpv_t *pgp, const voi
 	if (keyring) {
 		return (size  0) ?
 			read_binary_memory(pgp, pubring, keyring, (size_t)size) :
-			read_binary_file(pgp, pubring, %s, keyring);
+			read_binary_file(pgp, pubring, %s, (const char *)keyring);
 	}
 	return read_binary_file(pgp, pubring, %s/%s, nonnull_getenv(HOME), .gnupg/pubring.gpg);
 }

CVS commit: src/crypto/external/bsd/netpgp/dist/src/libverify

[Hisashi T Fujinaka]

Module Name:src
Committed By:   htodd
Date:   Mon Jan  6 23:23:10 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify: libverify.c

Log Message:
Fix build (cast to const char *).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.6 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.7
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.6	Mon Jan  6 22:59:10 2014
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c	Mon Jan  6 23:23:10 2014
@@ -1880,7 +1880,7 @@ setup_data(pgpv_cursor_t *cursor, pgpv_t
 		if (is_armored(buf, sizeof(buf))) {
 			read_ascii_armor_file(cursor, p);
 		} else {
-			read_binary_file(pgp, signature, %s, p);
+			read_binary_file(pgp, signature, %s, (const char *)p);
 		}
 		fclose(fp);
 	} else {

CVS commit: src/crypto/external/bsd/netpgp/dist/src/libdigest

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Oct 19 22:54:44 UTC 2013

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libdigest: tiger.c

Log Message:
avoid casts when the necessary union member is already available.
from apb.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.c:1.2 src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.c:1.2	Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libdigest/tiger.c	Sat Oct 19 22:54:44 2013
@@ -819,7 +819,7 @@ TIGER_Update(TIGER_CTX *ctx, const void 
 	for (; j  56; j++) {
 		u.temp8[j] = 0;
 	}
-	((uint64_t *)(void *)((u.temp8[56])))[0] = ((uint64_t)length)  3;
+	u.temp64[7] = ((uint64_t)length)  3;
 	tiger_compress(u.temp64, ctx-ctx);
 }
 

CVS commit: src/crypto/external/bsd/netpgp/lib/verify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Sep 11 09:57:09 UTC 2013

Modified Files:
src/crypto/external/bsd/netpgp/lib/verify: Makefile

Log Message:
Add dependency on libz and libbz2.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/lib/verify/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.5 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.6
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.5	Thu Dec 27 14:16:16 2012
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile	Wed Sep 11 09:57:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/12/27 14:16:16 martin Exp $
+# $NetBSD: Makefile,v 1.6 2013/09/11 09:57:09 joerg Exp $
 
 LIB=netpgpverify
 SRCS=libverify.c b64.c pgpsum.c
@@ -16,6 +16,9 @@ EXTDIST=${.CURDIR}/../../dist
 INCS=verify.h
 INCSDIR=/usr/include/netpgp
 
+LIBDPLIBS+=	z		${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+=	bz2		${NETBSDSRCDIR}/lib/libbz2
+
 .include bsd.lib.mk
 
 .if ${HAVE_GCC:U} == 45  ${MACHINE_CPU} == ia64

CVS commit: src/crypto/external/bsd/netpgp/dist/src/libbn

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Mar 19 01:00:17 UTC 2013

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libbn: bignum.c

Log Message:
fix some lint on i386, noticed by Greg Troxel, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.4 src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.4	Thu Nov 22 00:37:55 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c	Tue Mar 19 01:00:16 2013
@@ -1394,7 +1394,7 @@ fast_mp_invmod (mp_int * a, mp_int * b, 
   if ((res = mp_copy (y, v)) != MP_OKAY) {
 goto LBL_ERR;
   }
-  mp_set (D, 1);
+  mp_set (D, (unsigned long)1);
 
 top:
   /* 4.  while u is even do */
@@ -1463,7 +1463,7 @@ top:
   /* now a = C, b = D, gcd == g*v */
 
   /* if v != 1 then there is no inverse */
-  if (mp_cmp_d (v, 1) != MP_EQ) {
+  if (mp_cmp_d (v, (unsigned long)1) != MP_EQ) {
 res = MP_VAL;
 goto LBL_ERR;
   }
@@ -1522,8 +1522,8 @@ mp_invmod_slow (mp_int * a, mp_int * b, 
   if ((res = mp_copy (y, v)) != MP_OKAY) {
 goto LBL_ERR;
   }
-  mp_set (A, 1);
-  mp_set (D, 1);
+  mp_set (A, (unsigned long)1);
+  mp_set (D, (unsigned long)1);
 
 top:
   /* 4.  while u is even do */