Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/netpgp Bring over the standalone netpgpv...
details: https://anonhg.NetBSD.org/src/rev/0785998c9571
branches: trunk
changeset: 327470:0785998c9571
user: agc <agc%NetBSD.org@localhost>
date: Sun Mar 09 00:15:45 2014 +0000
description:
Bring over the standalone netpgpverify sources from
pkgsrc/security/netpgpverify.
No functional change.
diffstat:
crypto/external/bsd/netpgp/bin/netpgpverify/Makefile | 135 +-
crypto/external/bsd/netpgp/dist/src/Makefile.am | 4 +-
crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd | 32 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in | 557 +-
crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.lib.in | 29 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.libtool.in | 32 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/NetBSD-6.0_RC1_hashes.asc | 8478 ++++++++++
crypto/external/bsd/netpgp/dist/src/netpgpverify/NetBSD-6.0_RC1_hashes.gpg | Bin
crypto/external/bsd/netpgp/dist/src/netpgpverify/TODO | 12 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/array.h | 82 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c | 355 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h | 32 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/bignum.c | 5641 ++++++
crypto/external/bsd/netpgp/dist/src/netpgpverify/bn.h | 146 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/bufgap.c | 508 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/bufgap.h | 88 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c | 2037 ++
crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h | 284 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h | 511 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh | 119 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/configure | 64 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/data | 26 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/data.gpg | Bin
crypto/external/bsd/netpgp/dist/src/netpgpverify/data.sig | Bin
crypto/external/bsd/netpgp/dist/src/netpgpverify/defs.h | 92 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.c | 306 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.h | 90 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3 | 154 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c | 2724 +++
crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c | 47 +-
crypto/external/bsd/netpgp/dist/src/netpgpverify/md5.h | 60 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/md5c.c | 329 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c | 82 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h | 53 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1 | 230 +-
crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c | 263 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.h | 40 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/pubring.gpg | Bin
crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.c | 369 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.h | 58 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c | 698 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.h | 155 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.c | 250 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.h | 39 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c | 982 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.h | 120 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/sshtest-20140202 | 51 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/sshtest-20140202.pub | 1 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c | 906 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.h | 65 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h | 296 +
crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.c | 2247 ++
crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.h | 1701 ++
53 files changed, 30786 insertions(+), 794 deletions(-)
diffs (truncated from 31919 to 300 lines):
diff -r 43d12352ae74 -r 0785998c9571 crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sat Mar 08 23:38:52 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sun Mar 09 00:15:45 2014 +0000
@@ -1,119 +1,36 @@
-# $NetBSD: Makefile,v 1.4 2012/11/22 21:20:44 agc Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.5 2014/03/09 00:15:46 agc Exp $
PROG=netpgpverify
-SRCS+=main.c
-BINDIR=/usr/bin
+
+SRCS= b64.c bignum.c bufgap.c digest.c
+SRCS+= libverify.c main.c misc.c
+SRCS+= pgpsum.c rsa.c
-WARNS=5
-MAN=netpgpverify.1
+SRCS+= bzlib.c zlib.c
-CPPFLAGS+=-I${EXTDIST}/libverify
+SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
+
+CPPFLAGS+=-I. ${EXTDIST}/src/netpgpverify
-LIBNETPGPVERIFYDIR!= cd ${.CURDIR}/../../lib/verify && ${PRINTOBJDIR}
-LDADD+= -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
-DPADD+= ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+.ifndef PRODUCTION
+CPPFLAGS+=-g -O0
+LDFLAGS+=-g -O0
+.endif
-LDADD+= -lz -lbz2
-DPADD+= ${LIBZ} ${LIBBZ2}
+MAN= netpgpverify.1
+WARNS= 6
-EXTDIST= ${.CURDIR}/../../dist/src
-.PATH: ${EXTDIST}/netpgpverify
+EXTDIST=${.CURDIR}/../../dist
+
+.PATH: ${EXTDIST}/src/netpgpverify
.include <bsd.prog.mk>
-t: ${PROG}
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c verify b.gpg > output16
- diff expected16 output16
- rm -f output16
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c verify a.gpg > output17
- diff expected17 output17
- rm -f output17
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c verify gpgsigned-a.gpg > output18
- diff expected18 output18
- rm -f output18
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c verify NetBSD-6.0_RC2_hashes.asc > output19
- diff expected19 output19
- rm -f output19
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c cat jj.asc > output20
- diff expected20 output20
- rm -f output20
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < a.gpg > output21
- diff expected21 output21
- rm -f output21
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < jj.asc > output22
- diff expected22 output22
- rm -f output22
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < NetBSD-6.0_RC2_hashes.asc > output23
- diff expected23 output23
- rm -f output23
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < b.gpg > output24
- diff expected24 output24
- rm -f output24
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} NetBSD-6.0_RC1_hashes.gpg > output25
- diff expected25 output25
- rm -f output25
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < NetBSD-6.0_RC1_hashes.gpg > output26
- diff expected26 output26
- rm -f output26
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < NetBSD-6.0_hashes.asc > output27
- diff expected27 output27
- rm -f output27
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} NetBSD-6.0_hashes.asc > output28
- diff expected28 output28
- rm -f output28
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} NetBSD-6.0_RC1_hashes_ascii.gpg > output29
- diff expected29 output29
- rm -f output29
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} < NetBSD-6.0_RC1_hashes_ascii.gpg > output30
- diff expected30 output30
- rm -f output30
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c cat b.gpg b.gpg b.gpg > output31
- diff expected31 output31
- rm -f output31
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} b.gpg b.gpg b.gpg > output32
- diff expected32 output32
- rm -f output32
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c cat b.gpg jj.asc b.gpg > output33
- diff expected33 output33
- rm -f output33
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} det.sig > output34
- diff expected34 output34
- rm -f output34
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c cat det.sig > output35
- diff expected35 output35
- rm -f output35
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in1.gpg > output36
- diff expected36 output36
- rm -f output36
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg < in1.gpg > output37
- diff expected37 output37
- rm -f output37
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in1.asc > output38
- diff expected38 output38
- rm -f output38
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg < in1.asc > output39
- diff expected39 output39
- rm -f output39
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.gpg > output40
- diff expected40 output40
- rm -f output40
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat < in1.gpg > output41
- diff expected41 output41
- rm -f output41
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.asc > output42
- diff expected42 output42
- rm -f output42
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat < in1.asc > output43
- diff expected43 output43
- rm -f output43
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in2.gpg > output44
- diff expected44 output44
- rm -f output44
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in2.asc > output45
- diff expected45 output45
- rm -f output45
- env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k problem-pubring.gpg NetBSD-6.0_hashes.asc > output46
- diff expected46 output46
- rm -f output46
+t tst: ${PROG}
+ ./${PROG} -k ${EXTDIST}/src/netpgpverify/pubring.gpg ${EXTDIST}/src/netpgpverify/NetBSD-6.0_RC1_hashes.asc
+ ./${PROG} -k ${EXTDIST}/src/netpgpverify/pubring.gpg ${EXTDIST}/src/netpgpverify/NetBSD-6.0_RC1_hashes.gpg
+ ./${PROG} -v
+ ./${PROG} -S ${EXTDIST}/src/netpgpverify/sshtest-20140202.pub ${EXTDIST}/src/netpgpverify/data.gpg
+ ./${PROG} -S ${EXTDIST}/src/netpgpverify/sshtest-20140202.pub ${EXTDIST}/src/netpgpverify/data.sig
+ @echo "expected failure, to check bad signatures fail to verify"
+ -sed -e 's|A|B|' ${EXTDIST}/src/netpgpverify/data.gpg | ./${PROG} -S ${EXTDIST}/src/netpgpverify/sshtest-20140202.pub
diff -r 43d12352ae74 -r 0785998c9571 crypto/external/bsd/netpgp/dist/src/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/Makefile.am Sat Mar 08 23:38:52 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/Makefile.am Sun Mar 09 00:15:45 2014 +0000
@@ -1,3 +1,3 @@
-## $NetBSD: Makefile.am,v 1.6 2014/02/17 06:38:07 agc Exp $
+## $NetBSD: Makefile.am,v 1.7 2014/03/09 00:15:45 agc Exp $
-SUBDIRS = libmj lib netpgp netpgpkeys
+SUBDIRS = libmj libtransit lib netpgp netpgpkeys
diff -r 43d12352ae74 -r 0785998c9571 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd Sun Mar 09 00:15:45 2014 +0000
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile.bsd,v 1.1 2014/03/09 00:15:45 agc Exp $
+
+PROG=netpgpverify
+
+SRCS= b64.c bignum.c bufgap.c digest.c
+SRCS+= libverify.c main.c misc.c
+SRCS+= pgpsum.c rsa.c
+
+SRCS+= bzlib.c zlib.c
+
+SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
+
+CPPFLAGS+=-I.
+
+.ifndef PRODUCTION
+CPPFLAGS+=-g -O0
+LDFLAGS+=-g -O0
+.endif
+
+MAN= netpgpverify.1
+WARNS= 6
+
+.include <bsd.prog.mk>
+
+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 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
diff -r 43d12352ae74 -r 0785998c9571 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Sat Mar 08 23:38:52 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Sun Mar 09 00:15:45 2014 +0000
@@ -1,538 +1,35 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
+# $NetBSD: Makefile.in,v 1.8 2014/03/09 00:15:45 agc Exp $
+
+PROG=netpgpverify
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
+OBJS= b64.o bignum.o bufgap.o digest.o
+OBJS+= libverify.o main.o misc.o
+OBJS+= pgpsum.o rsa.o
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = netpgpverify$(EXEEXT)
-subdir = src/netpgpverify
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/lib/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
-netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
-netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la ../libmj/libmj.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib
-depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(netpgpverify_SOURCES)
-DIST_SOURCES = $(netpgpverify_SOURCES)
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man_MANS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOM4TE = @AUTOM4TE@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CANONICAL_HOST = @CANONICAL_HOST@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
Home |
Main Index |
Thread Index |
Old Index