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 <[email protected]>
.\" 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 *modifiers"
.Fc
.Ft int
.Fo pgpv_close
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c Fri Dec 5 04:42:36 2014
@@ -65,18 +65,3 @@ netpgp_deallocate(void *ptr, size_t size
free(ptr);
#endif
}
-
-#ifndef _KERNEL
-void
-logmessage(const int level, const char *fmt, ...)
-{
- va_list args;
-
- USE_ARG(level);
- if (fmt != NULL) {
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- va_end(args);
- }
-}
-#endif
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c Fri Dec 5 04:42:36 2014
@@ -29,7 +29,6 @@
#ifdef _KERNEL
# include <sys/kmem.h>
-# define logmessage log
#else
# include <stdio.h>
# include <stdlib.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.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.4 Tue Mar 11 17:48:31 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Fri Dec 5 04:42:36 2014
@@ -2597,6 +2597,16 @@ match_sig_id(pgpv_cursor_t *cursor, pgpv
return match_sig(cursor, signature, pubkey, data, insize);
}
+/* get an element from the found array */
+int
+pgpv_get_cursor_element(pgpv_cursor_t *cursor, size_t element)
+{
+ if (cursor && element < ARRAY_COUNT(cursor->found)) {
+ return (int)ARRAY_ELEMENT(cursor->found, element);
+ }
+ return -1;
+}
+
/* verify the signed packets we have */
size_t
pgpv_verify(pgpv_cursor_t *cursor, pgpv_t *pgp, const void *p, ssize_t size)
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.4 Sun Mar 9 07:01:42 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c Fri Dec 5 04:42:36 2014
@@ -35,8 +35,6 @@
#include "verify.h"
-#include "array.h"
-
/* print the time nicely */
static void
ptime(int64_t secs)
@@ -95,6 +93,7 @@ verify_data(pgpv_t *pgp, const char *cmd
size_t size;
size_t cookie;
char *data;
+ int el;
memset(&cursor, 0x0, sizeof(cursor));
if (strcasecmp(cmd, "cat") == 0) {
@@ -109,7 +108,8 @@ verify_data(pgpv_t *pgp, const char *cmd
if (pgpv_verify(&cursor, pgp, in, cc)) {
printf("Good signature for %s made ", inname);
ptime(cursor.sigtime);
- pentry(pgp, ARRAY_ELEMENT(cursor.found, 0), modifiers);
+ el = pgpv_get_cursor_element(&cursor, 0);
+ pentry(pgp, el, modifiers);
return 1;
}
fprintf(stderr, "Signature did not match contents -- %s\n", cursor.why);
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.2 Tue Mar 11 17:21:05 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h Fri Dec 5 04:42:36 2014
@@ -44,10 +44,6 @@ __BEGIN_DECLS
void *netpgp_allocate(size_t /*n*/, size_t /*nels*/);
void netpgp_deallocate(void */*ptr*/, size_t /*size*/);
-#ifndef _KERNEL
-void logmessage(const int /*level*/, const char */*fmt*/, ...) __printflike(2, 3);
-#endif
-
__END_DECLS
#endif
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.2 Sat Nov 29 20:18:44 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h Fri Dec 5 04:42:36 2014
@@ -23,9 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_ 20140304
+#define NETPGP_VERIFY_H_ 20141204
-#define NETPGPVERIFY_VERSION "netpgpverify portable 20141129"
+#define NETPGPVERIFY_VERSION "netpgpverify portable 20141204"
#include <sys/types.h>
@@ -286,6 +286,7 @@ int pgpv_read_ssh_pubkeys(pgpv_t */*pgp*
size_t pgpv_verify(pgpv_cursor_t */*cursor*/, pgpv_t */*pgp*/, const void */*mem/file*/, ssize_t /*size*/);
size_t pgpv_get_verified(pgpv_cursor_t */*cursor*/, size_t /*cookie*/, char **/*ret*/);
+int pgpv_get_cursor_element(pgpv_cursor_t */*cursor*/, size_t /*element*/);
size_t pgpv_get_entry(pgpv_t */*pgp*/, unsigned /*ent*/, char **/*ret*/, const char */*modifiers*/);
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.6 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.7
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.6 Wed Sep 11 09:57:09 2013
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Fri Dec 5 04:42:36 2014
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.6 2013/09/11 09:57:09 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/05 04:42:36 agc Exp $
LIB=netpgpverify
-SRCS=libverify.c b64.c pgpsum.c
-SRCS+=digest.c tiger.c
-SRCS+=bignum.c misc.c
-CPPFLAGS+=-I${EXTDIST}/src/libbn
-CPPFLAGS+=-I${EXTDIST}/src/libdigest
-CPPFLAGS+=-I${EXTDIST}/src/librsa
+SRCS+=b64.c
+SRCS+=bignum.c
+SRCS+=bufgap.c
+SRCS+=digest.c
+SRCS+=libverify.c
+SRCS+=misc.c
+SRCS+=pgpsum.c
+SRCS+=rsa.c
+SRCS+=bzlib.c
+SRCS+=zlib.c
+SRCS+=sha1.c
+SRCS+=sha2.c
+SRCS+=md5c.c
+SRCS+=rmd160.c
+SRCS+=tiger.c
+CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
MAN=libnetpgpverify.3
WARNS=5
EXTDIST=${.CURDIR}/../../dist
-.PATH: ${EXTDIST}/src/libverify ${EXTDIST}/src/libdigest ${EXTDIST}/src/libbn ${EXTDIST}/src/librsa
+.PATH: ${EXTDIST}/src/netpgpverify
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"
Added files:
Index: src/crypto/external/bsd/netpgp/lib/verify/config.h
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/verify/config.h:1.1
--- /dev/null Fri Dec 5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/lib/verify/config.h Fri Dec 5 04:42:36 2014
@@ -0,0 +1,12 @@
+#ifndef CONFIG_H_
+#define CONFIG_H_ 20141204
+
+#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_ */
