[src/trunk]: src/crypto/external/bsd/netpgp/dist Update base version to 20101103

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60f65698ea3d
branches:  trunk
changeset: 758404:60f65698ea3d
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Nov 04 07:01:52 2010 +0000

description:
Update base version to 20101103

Add openssl/camellia.h to the list of header files we look for in autoconf

Re-generate configure scripts

diffstat:

 crypto/external/bsd/netpgp/dist/TODO                      |   9 +++-
 crypto/external/bsd/netpgp/dist/configure                 |  31 +++++++-------
 crypto/external/bsd/netpgp/dist/configure.ac              |  14 +++---
 crypto/external/bsd/netpgp/dist/src/lib/config.h.in       |   3 +
 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile       |   6 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile |   6 +-
 6 files changed, 40 insertions(+), 29 deletions(-)

diffs (226 lines):

diff -r 2e48ac924125 -r 60f65698ea3d crypto/external/bsd/netpgp/dist/TODO
--- a/crypto/external/bsd/netpgp/dist/TODO      Thu Nov 04 06:46:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/TODO      Thu Nov 04 07:01:52 2010 +0000
@@ -1,6 +1,11 @@
 To Do
 =====
+check pkt size during read
+list sigs on a per-user basis
 elgamal enc/decryption?
+2^n sized packets - regions?
+json for verification in netpgp
+show attributes on key listings
 agent
 agentctl
 convert to and from ascii armored sigs
@@ -9,7 +14,6 @@
 is get_passphrase_cb needed?
 error logging
 separate from libcrypto?
-64-bit offsets
 thresholds
 default compression when signing?
 
@@ -99,3 +103,6 @@
 return userids from successful verify, and then print id out if required
 convert between pgp and ssh key formats
 PEM ssh keys and passphrases
+camellia addition
+fix calloc return values in symmetric.c/ops_crypt_t
+prog to convert from pgp sec to ssh sec
diff -r 2e48ac924125 -r 60f65698ea3d crypto/external/bsd/netpgp/dist/configure
--- a/crypto/external/bsd/netpgp/dist/configure Thu Nov 04 06:46:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure Thu Nov 04 07:01:52 2010 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.34 .
+# From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20100901.
+# Generated by GNU Autoconf 2.63 for netpgp 20101103.
 #
 # Report bugs to <Alistair Crooks <agc%netbsd.org@localhost> c0596823>.
 #
@@ -751,8 +751,8 @@
 # Identity of this package.
 PACKAGE_NAME='netpgp'
 PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20100901'
-PACKAGE_STRING='netpgp 20100901'
+PACKAGE_VERSION='20101103'
+PACKAGE_STRING='netpgp 20101103'
 PACKAGE_BUGREPORT='Alistair Crooks <agc%netbsd.org@localhost> c0596823'
 
 ac_unique_file="src/netpgp/netpgp.c"
@@ -1488,7 +1488,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 20100901 to adapt to many kinds of systems.
+\`configure' configures netpgp 20101103 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1558,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of netpgp 20100901:";;
+     short | recursive ) echo "Configuration of netpgp 20101103:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,7 +1666,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-netpgp configure 20100901
+netpgp configure 20101103
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1680,7 +1680,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 20100901, which was
+It was created by netpgp $as_me 20101103, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2567,7 +2567,7 @@
 
 # Define the identity of the package.
  PACKAGE='netpgp'
- VERSION='20100901'
+ VERSION='20101103'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20506,10 +20506,11 @@
 
 
 
-for ac_header in openssl/aes.h openssl/bn.h openssl/cast.h openssl/des.h \
-                  openssl/dsa.h openssl/err.h openssl/idea.h openssl/md5.h \
-                  openssl/rand.h openssl/rsa.h openssl/sha.h openssl/err.h \
-                  openssl/sha.h
+
+for ac_header in openssl/aes.h openssl/bn.h openssl/camellia.h openssl/cast.h \
+                 openssl/des.h openssl/dsa.h openssl/err.h openssl/idea.h \
+                 openssl/md5.h openssl/rand.h openssl/rsa.h openssl/sha.h \
+                 openssl/err.h openssl/sha.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -22645,7 +22646,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 20100901, which was
+This file was extended by netpgp $as_me 20101103, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22708,7 +22709,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-netpgp config.status 20100901
+netpgp config.status 20101103
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 2e48ac924125 -r 60f65698ea3d crypto/external/bsd/netpgp/dist/configure.ac
--- a/crypto/external/bsd/netpgp/dist/configure.ac      Thu Nov 04 06:46:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure.ac      Thu Nov 04 07:01:52 2010 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.35 2010/09/02 06:00:11 agc Exp $
+# $NetBSD: configure.ac,v 1.36 2010/11/04 07:01:52 agc Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([netpgp],[20100901],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
+AC_INIT([netpgp],[20101103],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
 AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.35 $])
+AC_REVISION([$Revision: 1.36 $])
 
 AS_SHELL_SANITIZE
 
@@ -47,10 +47,10 @@
 AC_CHECK_HEADERS([CommonCrypto/CommonDigest.h])
 AC_CHECK_HEADERS([dmalloc.h direct.h errno.h fcntl.h \
                  inttypes.h limits.h malloc.h zlib.h])
-AC_CHECK_HEADERS([openssl/aes.h openssl/bn.h openssl/cast.h openssl/des.h \
-                  openssl/dsa.h openssl/err.h openssl/idea.h openssl/md5.h \
-                  openssl/rand.h openssl/rsa.h openssl/sha.h openssl/err.h \
-                  openssl/sha.h])
+AC_CHECK_HEADERS([openssl/aes.h openssl/bn.h openssl/camellia.h openssl/cast.h \
+                 openssl/des.h openssl/dsa.h openssl/err.h openssl/idea.h \
+                 openssl/md5.h openssl/rand.h openssl/rsa.h openssl/sha.h \
+                 openssl/err.h openssl/sha.h])
 AC_CHECK_HEADERS([sys/cdefs.h sys/file.h sys/mman.h sys/param.h \
                   sys/resource.h sys/uio.h])
 
diff -r 2e48ac924125 -r 60f65698ea3d crypto/external/bsd/netpgp/dist/src/lib/config.h.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/config.h.in       Thu Nov 04 06:46:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/config.h.in       Thu Nov 04 07:01:52 2010 +0000
@@ -42,6 +42,9 @@
 /* Define to 1 if you have the <openssl/bn.h> header file. */
 #undef HAVE_OPENSSL_BN_H
 
+/* Define to 1 if you have the <openssl/camellia.h> header file. */
+#undef HAVE_OPENSSL_CAMELLIA_H
+
 /* Define to 1 if you have the <openssl/cast.h> header file. */
 #undef HAVE_OPENSSL_CAST_H
 
diff -r 2e48ac924125 -r 60f65698ea3d crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile       Thu Nov 04 06:46:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile       Thu Nov 04 07:01:52 2010 +0000
@@ -131,9 +131,9 @@
 PACKAGE = netpgp
 PACKAGE_BUGREPORT = Alistair Crooks <agc%netbsd.org@localhost> c0596823
 PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100901
+PACKAGE_STRING = netpgp 20101103
 PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100901
+PACKAGE_VERSION = 20101103
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/pkg/bin/pkg-config
 RANLIB = ranlib
@@ -141,7 +141,7 @@
 SET_MAKE = 
 SHELL = /bin/ksh
 STRIP = strip
-VERSION = 20100901
+VERSION = 20101103
 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
diff -r 2e48ac924125 -r 60f65698ea3d crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Thu Nov 04 06:46:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Thu Nov 04 07:01:52 2010 +0000
@@ -132,9 +132,9 @@
 PACKAGE = netpgp
 PACKAGE_BUGREPORT = Alistair Crooks <agc%netbsd.org@localhost> c0596823
 PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100901
+PACKAGE_STRING = netpgp 20101103
 PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100901
+PACKAGE_VERSION = 20101103
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/pkg/bin/pkg-config
 RANLIB = ranlib
@@ -142,7 +142,7 @@
 SET_MAKE = 
 SHELL = /bin/ksh
 STRIP = strip
-VERSION = 20100901
+VERSION = 20101103
 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