[src/trunk]: src/crypto/external/bsd/netpgp/dist Catch up the JSON routines b...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/netpgp/dist Catch up the JSON routines b...
From: agc <agc%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:15:46 +0000
details:   https://anonhg.NetBSD.org/src/rev/9c670fea1bea
branches:  trunk
changeset: 756883:9c670fea1bea
user:      agc <agc%NetBSD.org@localhost>
date:      Sat Aug 07 04:16:40 2010 +0000

description:
Catch up the JSON routines being in their own library. Use the JSON routines
to return all the text as a JSON-encoded string for all keys and sigs which
are returned.

diffstat:

 crypto/external/bsd/netpgp/dist/include/Makefile.in          |   28 +-
 crypto/external/bsd/netpgp/dist/include/netpgp.h             |    2 +
 crypto/external/bsd/netpgp/dist/src/Makefile.am              |    4 +-
 crypto/external/bsd/netpgp/dist/src/Makefile.in              |   30 +-
 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in          |   42 +-
 crypto/external/bsd/netpgp/dist/src/lib/config.h.in          |    4 +
 crypto/external/bsd/netpgp/dist/src/lib/keyring.c            |   40 ++-
 crypto/external/bsd/netpgp/dist/src/lib/keyring.h            |    3 +-
 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c             |   65 +++-
 crypto/external/bsd/netpgp/dist/src/lib/packet-print.c       |   95 ++---
 crypto/external/bsd/netpgp/dist/src/lib/version.h            |    2 +-
 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile          |    6 +-
 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in       |   28 +-
 crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in   |   28 +-
 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c  |  189 ++++++++++-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile    |    6 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in |   30 +-
 17 files changed, 463 insertions(+), 139 deletions(-)

diffs (truncated from 1232 to 300 lines):

diff -r a90636917847 -r 9c670fea1bea crypto/external/bsd/netpgp/dist/include/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/include/Makefile.in       Sat Aug 07 04:13:57 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/include/Makefile.in       Sat Aug 07 04:16:40 2010 +0000
@@ -36,7 +36,8 @@
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+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
@@ -70,37 +71,43 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
+OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -108,6 +115,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -120,8 +128,7 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -152,6 +159,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff -r a90636917847 -r 9c670fea1bea crypto/external/bsd/netpgp/dist/include/netpgp.h
--- a/crypto/external/bsd/netpgp/dist/include/netpgp.h  Sat Aug 07 04:13:57 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/include/netpgp.h  Sat Aug 07 04:16:40 2010 +0000
@@ -74,6 +74,7 @@
 
 /* key management */
 int netpgp_list_keys(netpgp_t *, const int);
+int netpgp_list_keys_json(netpgp_t *, char **, const int);
 int netpgp_find_key(netpgp_t *, char *);
 char *netpgp_get_key(netpgp_t *, const char *, const char *);
 char *netpgp_export_key(netpgp_t *, char *);
@@ -93,6 +94,7 @@
 int netpgp_decrypt_memory(netpgp_t *, const void *, const size_t, char *, size_t, const int);
 
 /* match and hkp-related functions */
+int netpgp_match_keys_json(netpgp_t *, char **, char *, const char *, const int);
 int netpgp_match_keys(netpgp_t *, char *, const char *, void *, const int);
 int netpgp_match_pubkeys(netpgp_t *, char *, void *);
 
diff -r a90636917847 -r 9c670fea1bea crypto/external/bsd/netpgp/dist/src/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/Makefile.am   Sat Aug 07 04:13:57 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/Makefile.am   Sat Aug 07 04:16:40 2010 +0000
@@ -1,3 +1,3 @@
-## $NetBSD: Makefile.am,v 1.4 2009/06/10 00:38:09 agc Exp $
+## $NetBSD: Makefile.am,v 1.5 2010/08/07 04:16:40 agc Exp $
 
-SUBDIRS = lib netpgp netpgpkeys netpgpverify
+SUBDIRS = libmj lib netpgp netpgpkeys netpgpverify
diff -r a90636917847 -r 9c670fea1bea crypto/external/bsd/netpgp/dist/src/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/Makefile.in   Sat Aug 07 04:13:57 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/Makefile.in   Sat Aug 07 04:16:40 2010 +0000
@@ -34,7 +34,8 @@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+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
@@ -69,37 +70,43 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
+OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -107,6 +114,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -119,8 +127,7 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -151,6 +158,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -166,7 +174,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = lib netpgp netpgpkeys netpgpverify
+SUBDIRS = libmj lib netpgp netpgpkeys netpgpverify
 all: all-recursive
 
 .SUFFIXES:
diff -r a90636917847 -r 9c670fea1bea crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Sat Aug 07 04:13:57 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Sat Aug 07 04:16:40 2010 +0000
@@ -36,7 +36,8 @@
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/config.h.in mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+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
@@ -56,13 +57,12 @@
        libnetpgp_la-compress.lo libnetpgp_la-create.lo \
        libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \
        libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \
-       libnetpgp_la-mj.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-ssh2pgp.lo \
-       libnetpgp_la-symmetric.lo libnetpgp_la-validate.lo \
-       libnetpgp_la-writer.lo
+       libnetpgp_la-mj.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-ssh2pgp.lo libnetpgp_la-symmetric.lo \
+       libnetpgp_la-validate.lo libnetpgp_la-writer.lo
 libnetpgp_la_OBJECTS = $(am_libnetpgp_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
@@ -98,37 +98,43 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
+OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Prev by Date: [src/trunk]: src/crypto/external/bsd/netpgp new directory structure - look in...
Next by Date: [src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib mj.c source file has...
Previous by Thread: [src/trunk]: src/crypto/external/bsd/netpgp new directory structure - look in...
Next by Thread: [src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib mj.c source file has...
Indexes:
Home | Main Index | Thread Index | Old Index