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

2020-11-01 Thread 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

2020-10-17 Thread 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/netpgpverify

2020-05-03 Thread 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/dist/src/netpgpverify

2018-08-13 Thread 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/netpgpverify

2018-07-25 Thread 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

2018-07-25 Thread 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/netpgpverify

2016-09-12 Thread 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

2016-09-03 Thread 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

2016-08-28 Thread 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/netpgpverify

2016-06-15 Thread 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

2016-06-15 Thread 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

2016-06-15 Thread 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

2016-06-14 Thread 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/dist/src/netpgpverify

2016-06-14 Thread 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

2016-06-14 Thread 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/netpgpverify

2015-02-04 Thread 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

2015-01-30 Thread 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/netpgpverify

2014-11-29 Thread 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/dist/src/netpgpverify

2014-03-11 Thread 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

2014-03-11 Thread 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

2014-03-11 Thread 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

2014-03-11 Thread 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/dist/src/netpgpverify

2014-03-08 Thread 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/netpgpverify

2010-11-15 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Mon Nov 15 21:29:21 UTC 2010

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

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
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.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.4	Thu Nov 11 04:51:18 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1	Mon Nov 15 21:29:21 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: netpgpverify.1,v 1.4 2010/11/11 04:51:18 agc Exp $
+.\ $NetBSD: netpgpverify.1,v 1.5 2010/11/15 21:29:21 wiz Exp $
 .\
 .\ Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -105,24 +105,24 @@
 .Bd -literal
 % netpgp --sign --userid=...@netbsd.org a
 signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid  Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] 
-uid  Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] 
-uid  Alistair Crooks \*[lt]...@netbsd.org\*[gt] 
-uid  Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] 
-uid  Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] 
+Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823
+uid  Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt]
+uid  Alistair Crooks \*[lt]...@pkgsrc.org\*[gt]
+uid  Alistair Crooks \*[lt]...@netbsd.org\*[gt]
+uid  Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt]
+uid  Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt]
 encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
 netpgp passphrase:
 % netpgpverify a.gpg
 Good signature for a.gpg made Thu Jan 29 03:06:00 2009
 using RSA (Encrypt or Sign) key 1B68DCFCC0596823
 signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
-uid  Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] 
-uid  Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] 
-uid  Alistair Crooks \*[lt]...@netbsd.org\*[gt] 
-uid  Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] 
-uid  Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] 
+Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823
+uid  Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt]
+uid  Alistair Crooks \*[lt]...@pkgsrc.org\*[gt]
+uid  Alistair Crooks \*[lt]...@netbsd.org\*[gt]
+uid  Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt]
+uid  Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt]
 encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
 %
 .Ed

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

2010-11-10 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Thu Nov 11 04:51:18 UTC 2010

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

Log Message:
Bring the netpgpverify(1) manual page into line with current output, etc.

With thanks to Jeremy Reed for the fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
cvs rdiff -u -r1.3 -r1.4 \
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
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.18 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.19
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.18	Thu Nov  4 07:01:53 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile	Thu Nov 11 04:51:18 2010
@@ -49,8 +49,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
 netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
-netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la
-netpgpverify_LDADD = ../lib/libnetpgp.la
+netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la ../libmj/libmj.la
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/lib
 depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
 am__depfiles_maybe = depfiles
@@ -67,7 +66,7 @@
 DIST_SOURCES = $(netpgpverify_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
-MANS = $(dist_man_MANS) $(man1_MANS)
+MANS = $(dist_man_MANS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -82,59 +81,52 @@
 CANONICAL_HOST = i386-unknown-netbsdelf5.99.26
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include
+CFLAGS = -g -O2
 CPP = gcc -E
-CPPFLAGS =  -I/usr/include
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CPPFLAGS = 
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO = /bin/echo
+DSYMUTIL = 
+DUMPBIN = 
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /usr/bin/grep -E
 EXEEXT = 
-F77 = 
-FFLAGS = 
-FGREP = @FGREP@
+FGREP = /usr/bin/grep -F
 GREP = /usr/bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = @LD@
-LDFLAGS =  -L/usr/lib
+LD = /usr/bin/ld
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lcrypto -lbz2 -lz  -lssl -lcrypto
+LIBS = -lcrypto -lbz2 -lz 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = @LIPO@
+LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
 MAINT = #
 MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo
 MKDIR_P = ../../buildaux/install-sh -c -d
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
+NM = /usr/bin/nm -B
+NMEDIT = 
+OBJDUMP = objdump
 OBJEXT = o
 OPENSSL_INCLUDES = -I/usr/include
 OPENSSL_LDFLAGS = -L/usr/lib
 OPENSSL_LIBS = -lssl -lcrypto
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
+OTOOL = 
+OTOOL64 = 
 PACKAGE = netpgp
 PACKAGE_BUGREPORT = Alistair Crooks a...@netbsd.org c0596823
 PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20101103
+PACKAGE_STRING = netpgp 20101107
 PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20101103
+PACKAGE_VERSION = 20101107
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/pkg/bin/pkg-config
 RANLIB = ranlib
@@ -142,16 +134,14 @@
 SET_MAKE = 
 SHELL = /bin/ksh
 STRIP = strip
-VERSION = 20101103
+VERSION = 20101107
 WARNCFLAGS = -Werror -Wall -Wpointer-arith
 abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
 abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
 abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist
 abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist
 ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = 
+ac_ct_DUMPBIN = 
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -182,7 +172,7 @@
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-lt_ECHO = @lt_ECHO@
+lt_ECHO = /bin/echo
 mandir = ${datarootdir}/man
 mkdir_p = $(top_builddir)/buildaux/install-sh -c -d
 oldincludedir = /usr/include
@@ -201,8 +191,7 @@
 AM_CFLAGS = $(WARNCFLAGS)
 netpgpverify_SOURCES = verify.c
 netpgpverify_CPPFLAGS = -I$(top_srcdir)/include
-netpgpverify_LDADD = ../lib/libnetpgp.la
-man1_MANS = netpgpverify.1
+netpgpverify_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la
 dist_man_MANS = netpgpverify.1
 all: all-am
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.3

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

2010-11-05 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Fri Nov  5 07:41:20 UTC 2010

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

Log Message:
Explicitly link netpgpverify with libmj, rather than letting libnetpgp
bring it in.

Fixes a build issue on RHEL 6.


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

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.am
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.2	Thu May 20 00:33:01 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am	Fri Nov  5 07:41:20 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.2 2010/05/20 00:33:01 agc Exp $
+## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:41:20 agc Exp $
 
 AM_CFLAGS		= $(WARNCFLAGS)
 
@@ -8,7 +8,7 @@
 
 netpgpverify_CPPFLAGS	= -I$(top_srcdir)/include
 
-netpgpverify_LDADD	= ../lib/libnetpgp.la
+netpgpverify_LDADD	= ../lib/libnetpgp.la ../libmj/libmj.la
 
 man1_MANS		= netpgpverify.1

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

2010-08-06 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Sat Aug  7 04:41:58 UTC 2010

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

Log Message:
catch up with autoconf changes


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

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.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.4	Sat Aug  7 04:16:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in	Sat Aug  7 04:41:58 2010
@@ -50,6 +50,7 @@
 am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
 netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
 netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la
+netpgpverify_LDADD = ../lib/libnetpgp.la
 DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir)/src/lib
 depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
 am__depfiles_maybe = depfiles
@@ -81,19 +82,26 @@
 CANONICAL_HOST = @CANONICAL_HOST@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -102,9 +110,9 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ @OPENSSL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -141,7 +149,9 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@

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

2010-06-01 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Tue Jun  1 06:01:30 UTC 2010

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

Log Message:
remove an unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.11	Thu May 20 00:33:01 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c	Tue Jun  1 06:01:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: verify.c,v 1.11 2010/05/20 00:33:01 agc Exp $ */
+/* $NetBSD: verify.c,v 1.12 2010/06/01 06:01:29 agc Exp $ */
 
 /*-
  * Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
@@ -201,7 +201,6 @@
 static int
 netpgp_cmd(netpgp_t *netpgp, prog_t *p, char *f)
 {
-	const int	 cleartext = 1;
 	unsigned	 maxsize;
 	char		*out;
 	char		*in;

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

2010-06-01 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Tue Jun  1 06:07:56 UTC 2010

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

Log Message:
avoid another compiler warning


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
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/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.12 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.13
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.12	Tue Jun  1 06:01:29 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c	Tue Jun  1 06:07:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: verify.c,v 1.12 2010/06/01 06:01:29 agc Exp $ */
+/* $NetBSD: verify.c,v 1.13 2010/06/01 06:07:56 agc Exp $ */
 
 /*-
  * Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
 
 	*maxsize = (unsigned)atoi(netpgp_getvar(netpgp, max mem alloc));
 	size = 0;
-	*temp = NULL;
+	*out = *temp = NULL;
 	while ((n = read(STDIN_FILENO, buf, sizeof(buf)))  0) {
 		/* round up the allocation */
 		newsize = size + ((n / BUFSIZ) + 1) * BUFSIZ;

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

2010-05-31 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Mon May 31 06:09:42 UTC 2010

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

Log Message:
catch up with new structure for netpgpverify - from Tyler Retzlaff


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

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.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.2	Wed Jun 10 00:38:10 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in	Mon May 31 06:09:41 2010
@@ -48,7 +48,8 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
 netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
-netpgpverify_LDADD = $(LDADD)
+netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la
+netpgpverify_LDADD = ../lib/libnetpgp.la
 DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir)/src/lib
 depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
 am__depfiles_maybe = depfiles

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

2010-05-03 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Tue May  4 00:02:46 UTC 2010

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

Log Message:
Make this compile with gcc 4.5 - patch from Juan RP in PR pkg/43244


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
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/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.9	Wed Apr 14 06:31:23 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c	Tue May  4 00:02:46 2010
@@ -55,7 +55,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: verify.c,v 1.9 2010/04/14 06:31:23 agc Exp $);
+__RCSID($NetBSD: verify.c,v 1.10 2010/05/04 00:02:46 agc Exp $);
 #endif
 
 #include sys/types.h
@@ -569,6 +569,7 @@
  * \see RFC4880 9.1
  */
 typedef enum {
+	OPS_PKA_NONE = 0,	/* null value */
 	OPS_PKA_RSA = 1,	/* RSA (Encrypt or Sign) */
 	OPS_PKA_RSA_ENCRYPT_ONLY = 2,	/* RSA Encrypt-Only (deprecated -
 	 * \see RFC4880 13.5) */
@@ -5550,7 +5551,7 @@
 		free_BN(p-key.elgamal.y);
 		break;
 
-	case 0:
+	case OPS_PKA_NONE:
 		/* nothing to free */
 		break;