Module Name: src
Committed By: agc
Date: Tue Jun 1 05:55:56 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist: configure configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: version.h
src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.1
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile
Log Message:
Update netpgp to 3.99.3
Changes since 3.99.2:
+ avoid possible free() of new value passed to netpgp_setvar(),
with thanks to Anon Ymous.
+ netpgpkeys(1): print keys to stdout, not stderr - reported by Anon
Ymous.
+ fix DSA signatures and verification
+ simplify and shorten the internals of packet processing by getting rid of
the intermediate pseudo-abstraction layer, which detracted from understanding
and had no benefit whatsoever. Rename some enums and some definitions.
+ add some checking to new key generation, and don't try to read in
the keys after writing them - reported by Tyler Retzlaff
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.33 -r1.34 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.30 src/crypto/external/bsd/netpgp/dist/configure:1.31
--- src/crypto/external/bsd/netpgp/dist/configure:1.30 Sat May 8 02:45:45 2010
+++ src/crypto/external/bsd/netpgp/dist/configure Tue Jun 1 05:55:55 2010
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.30 .
+# From configure.ac Revision: 1.31 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20100507.
+# Generated by GNU Autoconf 2.63 for netpgp 20100531.
#
# Report bugs to <Alistair Crooks <a...@netbsd.org> c0596823>.
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20100507'
-PACKAGE_STRING='netpgp 20100507'
+PACKAGE_VERSION='20100531'
+PACKAGE_STRING='netpgp 20100531'
PACKAGE_BUGREPORT='Alistair Crooks <a...@netbsd.org> c0596823'
ac_unique_file="src/netpgp/netpgp.c"
@@ -1483,7 +1483,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures netpgp 20100507 to adapt to many kinds of systems.
+\`configure' configures netpgp 20100531 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1553,7 +1553,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netpgp 20100507:";;
+ short | recursive ) echo "Configuration of netpgp 20100531:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netpgp configure 20100507
+netpgp configure 20100531
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1674,7 +1674,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by netpgp $as_me 20100507, which was
+It was created by netpgp $as_me 20100531, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2561,7 +2561,7 @@
# Define the identity of the package.
PACKAGE='netpgp'
- VERSION='20100507'
+ VERSION='20100531'
cat >>confdefs.h <<_ACEOF
@@ -22306,7 +22306,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by netpgp $as_me 20100507, which was
+This file was extended by netpgp $as_me 20100531, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22369,7 +22369,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-netpgp config.status 20100507
+netpgp config.status 20100531
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Index: src/crypto/external/bsd/netpgp/dist/configure.ac
diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.31 src/crypto/external/bsd/netpgp/dist/configure.ac:1.32
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.31 Sat May 8 02:45:46 2010
+++ src/crypto/external/bsd/netpgp/dist/configure.ac Tue Jun 1 05:55:55 2010
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.31 2010/05/08 02:45:46 agc Exp $
+# $NetBSD: configure.ac,v 1.32 2010/06/01 05:55:55 agc Exp $
#
# Process this file with autoconf to produce a configure script.
-AC_INIT([netpgp],[20100507],[Alistair Crooks <a...@netbsd.org> c0596823])
+AC_INIT([netpgp],[20100531],[Alistair Crooks <a...@netbsd.org> c0596823])
AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.31 $])
+AC_REVISION([$Revision: 1.32 $])
AS_SHELL_SANITIZE
Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.33 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.34
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.33 Sat May 8 02:45:46 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h Tue Jun 1 05:55:56 2010
@@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "3.99.2"
+#define NETPGP_BASE_VERSION "3.99.3"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.14 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.15
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.14 Sat May 8 02:45:46 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile Tue Jun 1 05:55:56 2010
@@ -117,16 +117,16 @@
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <a...@netbsd.org> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100507
+PACKAGE_STRING = netpgp 20100531
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100507
+PACKAGE_VERSION = 20100531
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20100507
+VERSION = 20100531
WARNCFLAGS = -Werror -Wall -Wpointer-arith
abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.10 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.11
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.10 Fri May 14 17:27:35 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 Tue Jun 1 05:55:56 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpkeys.1,v 1.10 2010/05/14 17:27:35 joerg Exp $
+.\" $NetBSD: netpgpkeys.1,v 1.11 2010/06/01 05:55:56 agc Exp $
.\"
.\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 13, 2010
+.Dd May 31, 2010
.Dt NETPGPKEYS 1
.Os
.Sh NAME
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.13 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.14
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.13 Sat May 8 02:45:46 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Tue Jun 1 05:55:56 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 = -I. -I$(top_builddir)/src/lib
depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
am__depfiles_maybe = depfiles
@@ -117,16 +118,16 @@
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <a...@netbsd.org> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100507
+PACKAGE_STRING = netpgp 20100531
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100507
+PACKAGE_VERSION = 20100531
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20100507
+VERSION = 20100531
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
