[src/trunk]: src/crypto/external/bsd/netpgp Prepare for a new netpgp-20091210...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/netpgp Prepare for a new netpgp-20091210...
From: agc <agc%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:16:30 +0000
details:   https://anonhg.NetBSD.org/src/rev/bc6db8994880
branches:  trunk
changeset: 750053:bc6db8994880
user:      agc <agc%NetBSD.org@localhost>
date:      Mon Dec 14 23:29:56 2009 +0000

description:
Prepare for a new netpgp-20091210 portable release.

Apart from infrastructure changes, there are the following functional ones:

+ Update to version 20091210

+ provide a new netpgp_match_list_keys(3) function to perform a
regular-expression based search of all the keys in the keyring.  If no
pattern is specified to match, then all keys are returned.

+ provide a new netpgp_set_homedir(3) function, and use it to set the
home directory from the library, rather than individually in all the
programs which use the library

+ provide a new netpgp_incvar(3) function which will add a constant
increment (which may be negative) to the value of an internal
variable.  This is primarily used for the verbosity level within the
library, and is again a movement of the function into the library from
the individual programs which use the library

+ move to the specification of an ssh key file by internal variable,
rather than the directory holding an ssh key file

+ autoconf infrastructure changes

+ take a hammer to the _GNU_SOURCE definitions problems

+ don't rely on strnlen(3) being present everywhere

diffstat:

 crypto/external/bsd/netpgp/dist/TODO                        |    4 +-
 crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl     |    4 +-
 crypto/external/bsd/netpgp/dist/configure                   |   22 +-
 crypto/external/bsd/netpgp/dist/configure.ac                |    6 +-
 crypto/external/bsd/netpgp/dist/include/netpgp.h            |    4 +
 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am         |    5 +-
 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in         |   30 ++
 crypto/external/bsd/netpgp/dist/src/lib/bufgap.c            |   14 +-
 crypto/external/bsd/netpgp/dist/src/lib/keyring.c           |   10 +-
 crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3         |   38 +++-
 crypto/external/bsd/netpgp/dist/src/lib/misc.c              |   22 +-
 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c            |  139 ++++++++---
 crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h         |    2 +
 crypto/external/bsd/netpgp/dist/src/lib/packet-print.c      |    8 +-
 crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c           |    8 +-
 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile         |   32 +-
 crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c         |   57 +----
 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c |   54 +---
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile   |   44 +-
 crypto/external/bsd/netpgp/dist/tst                         |    6 +-
 crypto/external/bsd/netpgp/lib/config.h                     |    6 +-
 crypto/external/bsd/netpgp/mkdist                           |    9 +-
 22 files changed, 306 insertions(+), 218 deletions(-)

diffs (truncated from 1236 to 300 lines):

diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/TODO
--- a/crypto/external/bsd/netpgp/dist/TODO      Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/TODO      Mon Dec 14 23:29:56 2009 +0000
@@ -10,10 +10,11 @@
 separate from libcrypto?
 64-bit offsets
 thresholds
+Multiple recipients for encryption - ssss
 default compression when signing?
 elgamal enc/decryption?
-Multiple recipients for encryption
 convert tests from ./tst to the autotest ./tests/
+hkpd
 
 Done
 ====
@@ -74,3 +75,4 @@
 failure to run if no userid in gpg.conf (even if --userid specified)
 don't complain if no .gnupg dir (even when using --homedir)
 make it work with ssh host keys
+regex matching for names and signatures
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
--- a/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl   Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl   Mon Dec 14 23:29:56 2009 +0000
@@ -1,8 +1,8 @@
-#! /usr/pkg/bin/perl -wT
+#! /usr/pkg/bin/perl -w
 
 # netpgp bindings for perl
 
-use lib "/usr/src/crypto/external/bsd/netpgp-bindings/dist/bindings/perl";
+use lib "/usr/src/crypto/external/bsd/netpgp/dist/bindings/perl";
 
 use netpgpperl;
 
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/configure
--- a/crypto/external/bsd/netpgp/dist/configure Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure Mon Dec 14 23:29:56 2009 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.17 .
+# From configure.ac Revision: 1.18 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20090611.
+# Generated by GNU Autoconf 2.63 for netpgp 20091210.
 #
 # 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='20090611'
-PACKAGE_STRING='netpgp 20090611'
+PACKAGE_VERSION='20091210'
+PACKAGE_STRING='netpgp 20091210'
 PACKAGE_BUGREPORT='Alistair Crooks <agc%netbsd.org@localhost> 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 20090611 to adapt to many kinds of systems.
+\`configure' configures netpgp 20091210 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 20090611:";;
+     short | recursive ) echo "Configuration of netpgp 20091210:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,7 +1660,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-netpgp configure 20090611
+netpgp configure 20091210
 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 20090611, which was
+It was created by netpgp $as_me 20091210, 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='20090611'
+ VERSION='20091210'
 
 
 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 20090611, which was
+This file was extended by netpgp $as_me 20091210, 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 20090611
+netpgp config.status 20091210
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/configure.ac
--- a/crypto/external/bsd/netpgp/dist/configure.ac      Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure.ac      Mon Dec 14 23:29:56 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.18 2009/06/11 17:05:17 agc Exp $
+# $NetBSD: configure.ac,v 1.19 2009/12/14 23:29:56 agc Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([netpgp],[20090611],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
+AC_INIT([netpgp],[20091210],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
 AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.18 $])
+AC_REVISION([$Revision: 1.19 $])
 
 AS_SHELL_SANITIZE
 
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/include/netpgp.h
--- a/crypto/external/bsd/netpgp/dist/include/netpgp.h  Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/include/netpgp.h  Mon Dec 14 23:29:56 2009 +0000
@@ -66,6 +66,10 @@
 /* variables */
 int netpgp_setvar(netpgp_t *, const char *, const char *);
 char *netpgp_getvar(netpgp_t *, const char *);
+int netpgp_incvar(netpgp_t *, const char *, const int);
+
+/* set home directory information */
+int netpgp_set_homedir(netpgp_t *, char *, const char *, const int);
 
 /* key management */
 int netpgp_list_keys(netpgp_t *);
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am       Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am       Mon Dec 14 23:29:56 2009 +0000
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.3 2009/05/26 05:42:25 lukem Exp $
+## $NetBSD: Makefile.am,v 1.4 2009/12/14 23:29:56 agc Exp $
 
 AM_CFLAGS              = $(WARNCFLAGS)
 
@@ -7,9 +7,11 @@
 libnetpgp_la_CPPFLAGS  = -I$(top_srcdir)/include
 
 libnetpgp_la_SOURCES   = \
+       bufgap.c \
        compress.c \
        create.c \
        crypto.c \
+       fastctype.c \
        keyring.c \
        misc.c \
        netpgp.c \
@@ -19,6 +21,7 @@
        packet-show.c \
        reader.c \
        signature.c \
+       ssh2pgp.c \
        symmetric.c \
        validate.c \
        writer.c
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Mon Dec 14 23:29:56 2009 +0000
@@ -53,12 +53,15 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libnetpgp_la_LIBADD =
 am_libnetpgp_la_OBJECTS = libnetpgp_la-compress.lo \
+       libnetpgp_la-bufgap.lo \
        libnetpgp_la-create.lo libnetpgp_la-crypto.lo \
+       libnetpgp_la-fastctype.lo \
        libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \
        libnetpgp_la-netpgp.lo libnetpgp_la-openssl_crypto.lo \
        libnetpgp_la-packet-parse.lo libnetpgp_la-packet-print.lo \
        libnetpgp_la-packet-show.lo libnetpgp_la-reader.lo \
        libnetpgp_la-signature.lo libnetpgp_la-symmetric.lo \
+       libnetpgp_la-ssh2pgp.lo \
        libnetpgp_la-validate.lo libnetpgp_la-writer.lo
 libnetpgp_la_OBJECTS = $(am_libnetpgp_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -196,9 +199,11 @@
 lib_LTLIBRARIES = libnetpgp.la
 libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include
 libnetpgp_la_SOURCES = \
+       bufgap.c \
        compress.c \
        create.c \
        crypto.c \
+       fastctype.c \
        keyring.c \
        misc.c \
        netpgp.c \
@@ -208,6 +213,7 @@
        packet-show.c \
        reader.c \
        signature.c \
+       ssh2pgp.c \
        symmetric.c \
        validate.c \
        writer.c
@@ -301,9 +307,11 @@
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-bufgap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-compress.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-create.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-crypto.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-fastctype.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-keyring.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-misc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-netpgp.Plo@am__quote@
@@ -313,6 +321,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-show.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-reader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-signature.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-ssh2pgp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-symmetric.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-validate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-writer.Plo@am__quote@
@@ -338,6 +347,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
+libnetpgp_la-bufgap.lo: bufgap.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-MT libnetpgp_la-bufgap.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-bufgap.Tpo -c -o libnetpgp_la-bufgap.lo `test -f 'bufgap.c' || echo '$(srcdir)/'`bufgap.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libnetpgp_la-bufgap.Tpo $(DEPDIR)/libnetpgp_la-bufgap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='bufgap.c' object='libnetpgp_la-bufgap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-c -o libnetpgp_la-bufgap.lo `test -f 'bufgap.c' || echo '$(srcdir)/'`bufgap.c
+
 libnetpgp_la-compress.lo: compress.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-MT libnetpgp_la-compress.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-compress.Tpo -c -o libnetpgp_la-compress.lo `test -f 'compress.c' || echo '$(srcdir)/'`compress.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libnetpgp_la-compress.Tpo $(DEPDIR)/libnetpgp_la-compress.Plo
@@ -359,6 +375,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-c -o libnetpgp_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
 
+libnetpgp_la-fastctype.lo: fastctype.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-MT libnetpgp_la-fastctype.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-fastctype.Tpo -c -o libnetpgp_la-fastctype.lo `test -f 'fastctype.c' || echo '$(srcdir)/'`fastctype.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libnetpgp_la-fastctype.Tpo $(DEPDIR)/libnetpgp_la-fastctype.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='fastctype.c' object='libnetpgp_la-fastctype.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-c -o libnetpgp_la-fastctype.lo `test -f 'fastctype.c' || echo '$(srcdir)/'`fastctype.c
+
 libnetpgp_la-keyring.lo: keyring.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-MT libnetpgp_la-keyring.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-keyring.Tpo -c -o libnetpgp_la-keyring.lo `test -f 'keyring.c' || echo '$(srcdir)/'`keyring.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libnetpgp_la-keyring.Tpo $(DEPDIR)/libnetpgp_la-keyring.Plo
@@ -422,6 +445,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-c -o libnetpgp_la-signature.lo `test -f 'signature.c' || echo '$(srcdir)/'`signature.c
 
+libnetpgp_la-ssh2pgp.lo: ssh2pgp.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-MT libnetpgp_la-ssh2pgp.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-ssh2pgp.Tpo -c -o libnetpgp_la-ssh2pgp.lo `test -f 'ssh2pgp.c' || echo '$(srcdir)/'`ssh2pgp.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libnetpgp_la-ssh2pgp.Tpo $(DEPDIR)/libnetpgp_la-ssh2pgp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='ssh2pgp.c' object='libnetpgp_la-ssh2pgp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-c -o libnetpgp_la-ssh2pgp.lo `test -f 'ssh2pgp.c' || echo '$(srcdir)/'`ssh2pgp.c
+
 libnetpgp_la-symmetric.lo: symmetric.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
-MT libnetpgp_la-symmetric.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-symmetric.Tpo -c -o libnetpgp_la-symmetric.lo `test -f 'symmetric.c' || echo '$(srcdir)/'`symmetric.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libnetpgp_la-symmetric.Tpo $(DEPDIR)/libnetpgp_la-symmetric.Plo
diff -r 3e3c43b0ee51 -r bc6db8994880 crypto/external/bsd/netpgp/dist/src/lib/bufgap.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c  Mon Dec 14 21:19:47 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c  Mon Dec 14 23:29:56 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bufgap.c,v 1.2 2009/12/06 17:43:05 agc Exp $ */
+/* $NetBSD: bufgap.c,v 1.3 2009/12/14 23:29:56 agc Exp $ */
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -81,7 +81,17 @@
 #define Rune           char
 #define        utfbytes(x)     strlen(x)
 #define        utfrune(a, b)   strchr(a, b)
-#define        utfnlen(a, b)   strnlen(a, b)
+#define        utfnlen(a, b)   bounded_strlen(a, b)
+
+static size_t
Prev by Date: [src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Bump the netpgp base...
Next by Date: [src/trunk]: src/sys/arch/xen/xen Fix problem with using wedge like devicesi(...
Previous by Thread: [src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Bump the netpgp base...
Next by Thread: [src/trunk]: src/sys/arch/xen/xen Fix problem with using wedge like devicesi(...
Indexes:
Home | Main Index | Thread Index | Old Index