Sat Aug 7 04:16:41 2010 UTC ()
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.


(agc)
diff -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/include/Makefile.in
diff -r1.18 -r1.19 src/crypto/external/bsd/netpgp/dist/include/netpgp.h
diff -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/Makefile.am
diff -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/Makefile.in
diff -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
diff -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
diff -r1.39 -r1.40 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -r1.28 -r1.29 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
diff -r1.65 -r1.66 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -r1.34 -r1.35 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
diff -r1.37 -r1.38 src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -r1.16 -r1.17 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
diff -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in
diff -r1.14 -r1.15 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -r1.15 -r1.16 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
diff -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/include/Makefile.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/include/Makefile.in 2009/06/10 00:38:09 1.3
+++ src/crypto/external/bsd/netpgp/dist/include/Makefile.in 2010/08/07 04:16:40 1.4
@@ -26,27 +26,28 @@ INSTALL_HEADER = $(INSTALL_DATA) @@ -26,27 +26,28 @@ INSTALL_HEADER = $(INSTALL_DATA)
26transform = $(program_transform_name) 26transform = $(program_transform_name)
27NORMAL_INSTALL = : 27NORMAL_INSTALL = :
28PRE_INSTALL = : 28PRE_INSTALL = :
29POST_INSTALL = : 29POST_INSTALL = :
30NORMAL_UNINSTALL = : 30NORMAL_UNINSTALL = :
31PRE_UNINSTALL = : 31PRE_UNINSTALL = :
32POST_UNINSTALL = : 32POST_UNINSTALL = :
33build_triplet = @build@ 33build_triplet = @build@
34host_triplet = @host@ 34host_triplet = @host@
35subdir = include 35subdir = include
36DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ 36DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
37 $(srcdir)/Makefile.in 37 $(srcdir)/Makefile.in
38ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 38ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
39am__aclocal_m4_deps = $(top_srcdir)/configure.ac 39am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
 40 $(top_srcdir)/configure.ac
40am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 41am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
41 $(ACLOCAL_M4) 42 $(ACLOCAL_M4)
42mkinstalldirs = $(install_sh) -d 43mkinstalldirs = $(install_sh) -d
43CONFIG_HEADER = $(top_builddir)/src/lib/config.h 44CONFIG_HEADER = $(top_builddir)/src/lib/config.h
44CONFIG_CLEAN_FILES = 45CONFIG_CLEAN_FILES =
45SOURCES = 46SOURCES =
46DIST_SOURCES = 47DIST_SOURCES =
47am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 48am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
48am__vpath_adj = case $$p in \ 49am__vpath_adj = case $$p in \
49 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 50 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
50 *) f=$$p;; \ 51 *) f=$$p;; \
51 esac; 52 esac;
52am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 53am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -60,78 +61,84 @@ ACLOCAL = @ACLOCAL@ @@ -60,78 +61,84 @@ ACLOCAL = @ACLOCAL@
60AMTAR = @AMTAR@ 61AMTAR = @AMTAR@
61AR = @AR@ 62AR = @AR@
62AUTOCONF = @AUTOCONF@ 63AUTOCONF = @AUTOCONF@
63AUTOHEADER = @AUTOHEADER@ 64AUTOHEADER = @AUTOHEADER@
64AUTOM4TE = @AUTOM4TE@ 65AUTOM4TE = @AUTOM4TE@
65AUTOMAKE = @AUTOMAKE@ 66AUTOMAKE = @AUTOMAKE@
66AWK = @AWK@ 67AWK = @AWK@
67CANONICAL_HOST = @CANONICAL_HOST@ 68CANONICAL_HOST = @CANONICAL_HOST@
68CC = @CC@ 69CC = @CC@
69CCDEPMODE = @CCDEPMODE@ 70CCDEPMODE = @CCDEPMODE@
70CFLAGS = @CFLAGS@ 71CFLAGS = @CFLAGS@
71CPP = @CPP@ 72CPP = @CPP@
72CPPFLAGS = @CPPFLAGS@ 73CPPFLAGS = @CPPFLAGS@
73CXX = @CXX@ 
74CXXCPP = @CXXCPP@ 
75CXXDEPMODE = @CXXDEPMODE@ 
76CXXFLAGS = @CXXFLAGS@ 
77CYGPATH_W = @CYGPATH_W@ 74CYGPATH_W = @CYGPATH_W@
78DEFS = @DEFS@ 75DEFS = @DEFS@
79DEPDIR = @DEPDIR@ 76DEPDIR = @DEPDIR@
80ECHO = @ECHO@ 77DSYMUTIL = @DSYMUTIL@
 78DUMPBIN = @DUMPBIN@
81ECHO_C = @ECHO_C@ 79ECHO_C = @ECHO_C@
82ECHO_N = @ECHO_N@ 80ECHO_N = @ECHO_N@
83ECHO_T = @ECHO_T@ 81ECHO_T = @ECHO_T@
84EGREP = @EGREP@ 82EGREP = @EGREP@
85EXEEXT = @EXEEXT@ 83EXEEXT = @EXEEXT@
86F77 = @F77@ 84FGREP = @FGREP@
87FFLAGS = @FFLAGS@ 
88GREP = @GREP@ 85GREP = @GREP@
89INSTALL = @INSTALL@ 86INSTALL = @INSTALL@
90INSTALL_DATA = @INSTALL_DATA@ 87INSTALL_DATA = @INSTALL_DATA@
91INSTALL_PROGRAM = @INSTALL_PROGRAM@ 88INSTALL_PROGRAM = @INSTALL_PROGRAM@
92INSTALL_SCRIPT = @INSTALL_SCRIPT@ 89INSTALL_SCRIPT = @INSTALL_SCRIPT@
93INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 90INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 91LD = @LD@
94LDFLAGS = @LDFLAGS@ 92LDFLAGS = @LDFLAGS@
95LIBOBJS = @LIBOBJS@ 93LIBOBJS = @LIBOBJS@
96LIBS = @LIBS@ 94LIBS = @LIBS@
97LIBTOOL = @LIBTOOL@ 95LIBTOOL = @LIBTOOL@
 96LIPO = @LIPO@
98LN_S = @LN_S@ 97LN_S = @LN_S@
99LTLIBOBJS = @LTLIBOBJS@ 98LTLIBOBJS = @LTLIBOBJS@
100MAINT = @MAINT@ 99MAINT = @MAINT@
101MAKEINFO = @MAKEINFO@ 100MAKEINFO = @MAKEINFO@
102MKDIR_P = @MKDIR_P@ 101MKDIR_P = @MKDIR_P@
 102NM = @NM@
 103NMEDIT = @NMEDIT@
 104OBJDUMP = @OBJDUMP@
103OBJEXT = @OBJEXT@ 105OBJEXT = @OBJEXT@
 106OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 107OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 108OPENSSL_LIBS = @OPENSSL_LIBS@
 109OTOOL = @OTOOL@
 110OTOOL64 = @OTOOL64@
104PACKAGE = @PACKAGE@ 111PACKAGE = @PACKAGE@
105PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 112PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
106PACKAGE_NAME = @PACKAGE_NAME@ 113PACKAGE_NAME = @PACKAGE_NAME@
107PACKAGE_STRING = @PACKAGE_STRING@ 114PACKAGE_STRING = @PACKAGE_STRING@
108PACKAGE_TARNAME = @PACKAGE_TARNAME@ 115PACKAGE_TARNAME = @PACKAGE_TARNAME@
109PACKAGE_VERSION = @PACKAGE_VERSION@ 116PACKAGE_VERSION = @PACKAGE_VERSION@
110PATH_SEPARATOR = @PATH_SEPARATOR@ 117PATH_SEPARATOR = @PATH_SEPARATOR@
 118PKG_CONFIG = @PKG_CONFIG@
111RANLIB = @RANLIB@ 119RANLIB = @RANLIB@
112SED = @SED@ 120SED = @SED@
113SET_MAKE = @SET_MAKE@ 121SET_MAKE = @SET_MAKE@
114SHELL = @SHELL@ 122SHELL = @SHELL@
115STRIP = @STRIP@ 123STRIP = @STRIP@
116VERSION = @VERSION@ 124VERSION = @VERSION@
117WARNCFLAGS = @WARNCFLAGS@ 125WARNCFLAGS = @WARNCFLAGS@
118abs_builddir = @abs_builddir@ 126abs_builddir = @abs_builddir@
119abs_srcdir = @abs_srcdir@ 127abs_srcdir = @abs_srcdir@
120abs_top_builddir = @abs_top_builddir@ 128abs_top_builddir = @abs_top_builddir@
121abs_top_srcdir = @abs_top_srcdir@ 129abs_top_srcdir = @abs_top_srcdir@
122ac_ct_CC = @ac_ct_CC@ 130ac_ct_CC = @ac_ct_CC@
123ac_ct_CXX = @ac_ct_CXX@ 131ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
124ac_ct_F77 = @ac_ct_F77@ 
125am__include = @am__include@ 132am__include = @am__include@
126am__leading_dot = @am__leading_dot@ 133am__leading_dot = @am__leading_dot@
127am__quote = @am__quote@ 134am__quote = @am__quote@
128am__tar = @am__tar@ 135am__tar = @am__tar@
129am__untar = @am__untar@ 136am__untar = @am__untar@
130bindir = @bindir@ 137bindir = @bindir@
131build = @build@ 138build = @build@
132build_alias = @build_alias@ 139build_alias = @build_alias@
133build_cpu = @build_cpu@ 140build_cpu = @build_cpu@
134build_os = @build_os@ 141build_os = @build_os@
135build_vendor = @build_vendor@ 142build_vendor = @build_vendor@
136builddir = @builddir@ 143builddir = @builddir@
137datadir = @datadir@ 144datadir = @datadir@
@@ -142,26 +149,27 @@ exec_prefix = @exec_prefix@ @@ -142,26 +149,27 @@ exec_prefix = @exec_prefix@
142host = @host@ 149host = @host@
143host_alias = @host_alias@ 150host_alias = @host_alias@
144host_cpu = @host_cpu@ 151host_cpu = @host_cpu@
145host_os = @host_os@ 152host_os = @host_os@
146host_vendor = @host_vendor@ 153host_vendor = @host_vendor@
147htmldir = @htmldir@ 154htmldir = @htmldir@
148includedir = @includedir@ 155includedir = @includedir@
149infodir = @infodir@ 156infodir = @infodir@
150install_sh = @install_sh@ 157install_sh = @install_sh@
151libdir = @libdir@ 158libdir = @libdir@
152libexecdir = @libexecdir@ 159libexecdir = @libexecdir@
153localedir = @localedir@ 160localedir = @localedir@
154localstatedir = @localstatedir@ 161localstatedir = @localstatedir@
 162lt_ECHO = @lt_ECHO@
155mandir = @mandir@ 163mandir = @mandir@
156mkdir_p = @mkdir_p@ 164mkdir_p = @mkdir_p@
157oldincludedir = @oldincludedir@ 165oldincludedir = @oldincludedir@
158pdfdir = @pdfdir@ 166pdfdir = @pdfdir@
159prefix = @prefix@ 167prefix = @prefix@
160program_transform_name = @program_transform_name@ 168program_transform_name = @program_transform_name@
161psdir = @psdir@ 169psdir = @psdir@
162sbindir = @sbindir@ 170sbindir = @sbindir@
163sharedstatedir = @sharedstatedir@ 171sharedstatedir = @sharedstatedir@
164srcdir = @srcdir@ 172srcdir = @srcdir@
165sysconfdir = @sysconfdir@ 173sysconfdir = @sysconfdir@
166target_alias = @target_alias@ 174target_alias = @target_alias@
167top_build_prefix = @top_build_prefix@ 175top_build_prefix = @top_build_prefix@
cvs diff -r1.18 -r1.19 src/crypto/external/bsd/netpgp/dist/include/netpgp.h (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/include/netpgp.h 2010/03/16 04:14:29 1.18
+++ src/crypto/external/bsd/netpgp/dist/include/netpgp.h 2010/08/07 04:16:40 1.19
@@ -64,40 +64,42 @@ const char *netpgp_get_info(const char * @@ -64,40 +64,42 @@ const char *netpgp_get_info(const char *
64int netpgp_list_packets(netpgp_t *, char *, int, char *); 64int netpgp_list_packets(netpgp_t *, char *, int, char *);
65 65
66/* variables */ 66/* variables */
67int netpgp_setvar(netpgp_t *, const char *, const char *); 67int netpgp_setvar(netpgp_t *, const char *, const char *);
68char *netpgp_getvar(netpgp_t *, const char *); 68char *netpgp_getvar(netpgp_t *, const char *);
69int netpgp_incvar(netpgp_t *, const char *, const int); 69int netpgp_incvar(netpgp_t *, const char *, const int);
70int netpgp_unsetvar(netpgp_t *, const char *); 70int netpgp_unsetvar(netpgp_t *, const char *);
71 71
72/* set home directory information */ 72/* set home directory information */
73int netpgp_set_homedir(netpgp_t *, char *, const char *, const int); 73int netpgp_set_homedir(netpgp_t *, char *, const char *, const int);
74 74
75/* key management */ 75/* key management */
76int netpgp_list_keys(netpgp_t *, const int); 76int netpgp_list_keys(netpgp_t *, const int);
 77int netpgp_list_keys_json(netpgp_t *, char **, const int);
77int netpgp_find_key(netpgp_t *, char *); 78int netpgp_find_key(netpgp_t *, char *);
78char *netpgp_get_key(netpgp_t *, const char *, const char *); 79char *netpgp_get_key(netpgp_t *, const char *, const char *);
79char *netpgp_export_key(netpgp_t *, char *); 80char *netpgp_export_key(netpgp_t *, char *);
80int netpgp_import_key(netpgp_t *, char *); 81int netpgp_import_key(netpgp_t *, char *);
81int netpgp_generate_key(netpgp_t *, char *, int); 82int netpgp_generate_key(netpgp_t *, char *, int);
82 83
83/* file management */ 84/* file management */
84int netpgp_encrypt_file(netpgp_t *, const char *, const char *, char *, int); 85int netpgp_encrypt_file(netpgp_t *, const char *, const char *, char *, int);
85int netpgp_decrypt_file(netpgp_t *, const char *, char *, int); 86int netpgp_decrypt_file(netpgp_t *, const char *, char *, int);
86int netpgp_sign_file(netpgp_t *, const char *, const char *, char *, int, int, int); 87int netpgp_sign_file(netpgp_t *, const char *, const char *, char *, int, int, int);
87int netpgp_verify_file(netpgp_t *, const char *, const char *, int); 88int netpgp_verify_file(netpgp_t *, const char *, const char *, int);
88 89
89/* memory signing and encryption */ 90/* memory signing and encryption */
90int netpgp_sign_memory(netpgp_t *, const char *, char *, size_t, char *, size_t, const unsigned, const unsigned); 91int netpgp_sign_memory(netpgp_t *, const char *, char *, size_t, char *, size_t, const unsigned, const unsigned);
91int netpgp_verify_memory(netpgp_t *, const void *, const size_t, void *, size_t, const int); 92int netpgp_verify_memory(netpgp_t *, const void *, const size_t, void *, size_t, const int);
92int netpgp_encrypt_memory(netpgp_t *, const char *, void *, const size_t, char *, size_t, int); 93int netpgp_encrypt_memory(netpgp_t *, const char *, void *, const size_t, char *, size_t, int);
93int netpgp_decrypt_memory(netpgp_t *, const void *, const size_t, char *, size_t, const int); 94int netpgp_decrypt_memory(netpgp_t *, const void *, const size_t, char *, size_t, const int);
94 95
95/* match and hkp-related functions */ 96/* match and hkp-related functions */
 97int netpgp_match_keys_json(netpgp_t *, char **, char *, const char *, const int);
96int netpgp_match_keys(netpgp_t *, char *, const char *, void *, const int); 98int netpgp_match_keys(netpgp_t *, char *, const char *, void *, const int);
97int netpgp_match_pubkeys(netpgp_t *, char *, void *); 99int netpgp_match_pubkeys(netpgp_t *, char *, void *);
98 100
99int netpgp_validate_sigs(netpgp_t *); 101int netpgp_validate_sigs(netpgp_t *);
100 102
101__END_DECLS 103__END_DECLS
102 104
103#endif /* !NETPGP_H_ */ 105#endif /* !NETPGP_H_ */
cvs diff -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/Makefile.am (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/Makefile.am 2009/06/10 00:38:09 1.4
+++ src/crypto/external/bsd/netpgp/dist/src/Makefile.am 2010/08/07 04:16:40 1.5
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1## $NetBSD: Makefile.am,v 1.4 2009/06/10 00:38:09 agc Exp $ 1## $NetBSD: Makefile.am,v 1.5 2010/08/07 04:16:40 agc Exp $
2 2
3SUBDIRS = lib netpgp netpgpkeys netpgpverify 3SUBDIRS = libmj lib netpgp netpgpkeys netpgpverify
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/Makefile.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/Makefile.in 2009/06/10 00:38:09 1.3
+++ src/crypto/external/bsd/netpgp/dist/src/Makefile.in 2010/08/07 04:16:40 1.4
@@ -24,27 +24,28 @@ install_sh_SCRIPT = $(install_sh) -c @@ -24,27 +24,28 @@ install_sh_SCRIPT = $(install_sh) -c
24INSTALL_HEADER = $(INSTALL_DATA) 24INSTALL_HEADER = $(INSTALL_DATA)
25transform = $(program_transform_name) 25transform = $(program_transform_name)
26NORMAL_INSTALL = : 26NORMAL_INSTALL = :
27PRE_INSTALL = : 27PRE_INSTALL = :
28POST_INSTALL = : 28POST_INSTALL = :
29NORMAL_UNINSTALL = : 29NORMAL_UNINSTALL = :
30PRE_UNINSTALL = : 30PRE_UNINSTALL = :
31POST_UNINSTALL = : 31POST_UNINSTALL = :
32build_triplet = @build@ 32build_triplet = @build@
33host_triplet = @host@ 33host_triplet = @host@
34subdir = src 34subdir = src
35DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 35DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
36ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 36ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
37am__aclocal_m4_deps = $(top_srcdir)/configure.ac 37am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
 38 $(top_srcdir)/configure.ac
38am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 39am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
39 $(ACLOCAL_M4) 40 $(ACLOCAL_M4)
40mkinstalldirs = $(install_sh) -d 41mkinstalldirs = $(install_sh) -d
41CONFIG_HEADER = $(top_builddir)/src/lib/config.h 42CONFIG_HEADER = $(top_builddir)/src/lib/config.h
42CONFIG_CLEAN_FILES = 43CONFIG_CLEAN_FILES =
43SOURCES = 44SOURCES =
44DIST_SOURCES = 45DIST_SOURCES =
45RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 46RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
46 html-recursive info-recursive install-data-recursive \ 47 html-recursive info-recursive install-data-recursive \
47 install-dvi-recursive install-exec-recursive \ 48 install-dvi-recursive install-exec-recursive \
48 install-html-recursive install-info-recursive \ 49 install-html-recursive install-info-recursive \
49 install-pdf-recursive install-ps-recursive install-recursive \ 50 install-pdf-recursive install-ps-recursive install-recursive \
50 installcheck-recursive installdirs-recursive pdf-recursive \ 51 installcheck-recursive installdirs-recursive pdf-recursive \
@@ -59,78 +60,84 @@ ACLOCAL = @ACLOCAL@ @@ -59,78 +60,84 @@ ACLOCAL = @ACLOCAL@
59AMTAR = @AMTAR@ 60AMTAR = @AMTAR@
60AR = @AR@ 61AR = @AR@
61AUTOCONF = @AUTOCONF@ 62AUTOCONF = @AUTOCONF@
62AUTOHEADER = @AUTOHEADER@ 63AUTOHEADER = @AUTOHEADER@
63AUTOM4TE = @AUTOM4TE@ 64AUTOM4TE = @AUTOM4TE@
64AUTOMAKE = @AUTOMAKE@ 65AUTOMAKE = @AUTOMAKE@
65AWK = @AWK@ 66AWK = @AWK@
66CANONICAL_HOST = @CANONICAL_HOST@ 67CANONICAL_HOST = @CANONICAL_HOST@
67CC = @CC@ 68CC = @CC@
68CCDEPMODE = @CCDEPMODE@ 69CCDEPMODE = @CCDEPMODE@
69CFLAGS = @CFLAGS@ 70CFLAGS = @CFLAGS@
70CPP = @CPP@ 71CPP = @CPP@
71CPPFLAGS = @CPPFLAGS@ 72CPPFLAGS = @CPPFLAGS@
72CXX = @CXX@ 
73CXXCPP = @CXXCPP@ 
74CXXDEPMODE = @CXXDEPMODE@ 
75CXXFLAGS = @CXXFLAGS@ 
76CYGPATH_W = @CYGPATH_W@ 73CYGPATH_W = @CYGPATH_W@
77DEFS = @DEFS@ 74DEFS = @DEFS@
78DEPDIR = @DEPDIR@ 75DEPDIR = @DEPDIR@
79ECHO = @ECHO@ 76DSYMUTIL = @DSYMUTIL@
 77DUMPBIN = @DUMPBIN@
80ECHO_C = @ECHO_C@ 78ECHO_C = @ECHO_C@
81ECHO_N = @ECHO_N@ 79ECHO_N = @ECHO_N@
82ECHO_T = @ECHO_T@ 80ECHO_T = @ECHO_T@
83EGREP = @EGREP@ 81EGREP = @EGREP@
84EXEEXT = @EXEEXT@ 82EXEEXT = @EXEEXT@
85F77 = @F77@ 83FGREP = @FGREP@
86FFLAGS = @FFLAGS@ 
87GREP = @GREP@ 84GREP = @GREP@
88INSTALL = @INSTALL@ 85INSTALL = @INSTALL@
89INSTALL_DATA = @INSTALL_DATA@ 86INSTALL_DATA = @INSTALL_DATA@
90INSTALL_PROGRAM = @INSTALL_PROGRAM@ 87INSTALL_PROGRAM = @INSTALL_PROGRAM@
91INSTALL_SCRIPT = @INSTALL_SCRIPT@ 88INSTALL_SCRIPT = @INSTALL_SCRIPT@
92INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 89INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 90LD = @LD@
93LDFLAGS = @LDFLAGS@ 91LDFLAGS = @LDFLAGS@
94LIBOBJS = @LIBOBJS@ 92LIBOBJS = @LIBOBJS@
95LIBS = @LIBS@ 93LIBS = @LIBS@
96LIBTOOL = @LIBTOOL@ 94LIBTOOL = @LIBTOOL@
 95LIPO = @LIPO@
97LN_S = @LN_S@ 96LN_S = @LN_S@
98LTLIBOBJS = @LTLIBOBJS@ 97LTLIBOBJS = @LTLIBOBJS@
99MAINT = @MAINT@ 98MAINT = @MAINT@
100MAKEINFO = @MAKEINFO@ 99MAKEINFO = @MAKEINFO@
101MKDIR_P = @MKDIR_P@ 100MKDIR_P = @MKDIR_P@
 101NM = @NM@
 102NMEDIT = @NMEDIT@
 103OBJDUMP = @OBJDUMP@
102OBJEXT = @OBJEXT@ 104OBJEXT = @OBJEXT@
 105OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 106OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 107OPENSSL_LIBS = @OPENSSL_LIBS@
 108OTOOL = @OTOOL@
 109OTOOL64 = @OTOOL64@
103PACKAGE = @PACKAGE@ 110PACKAGE = @PACKAGE@
104PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 111PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
105PACKAGE_NAME = @PACKAGE_NAME@ 112PACKAGE_NAME = @PACKAGE_NAME@
106PACKAGE_STRING = @PACKAGE_STRING@ 113PACKAGE_STRING = @PACKAGE_STRING@
107PACKAGE_TARNAME = @PACKAGE_TARNAME@ 114PACKAGE_TARNAME = @PACKAGE_TARNAME@
108PACKAGE_VERSION = @PACKAGE_VERSION@ 115PACKAGE_VERSION = @PACKAGE_VERSION@
109PATH_SEPARATOR = @PATH_SEPARATOR@ 116PATH_SEPARATOR = @PATH_SEPARATOR@
 117PKG_CONFIG = @PKG_CONFIG@
110RANLIB = @RANLIB@ 118RANLIB = @RANLIB@
111SED = @SED@ 119SED = @SED@
112SET_MAKE = @SET_MAKE@ 120SET_MAKE = @SET_MAKE@
113SHELL = @SHELL@ 121SHELL = @SHELL@
114STRIP = @STRIP@ 122STRIP = @STRIP@
115VERSION = @VERSION@ 123VERSION = @VERSION@
116WARNCFLAGS = @WARNCFLAGS@ 124WARNCFLAGS = @WARNCFLAGS@
117abs_builddir = @abs_builddir@ 125abs_builddir = @abs_builddir@
118abs_srcdir = @abs_srcdir@ 126abs_srcdir = @abs_srcdir@
119abs_top_builddir = @abs_top_builddir@ 127abs_top_builddir = @abs_top_builddir@
120abs_top_srcdir = @abs_top_srcdir@ 128abs_top_srcdir = @abs_top_srcdir@
121ac_ct_CC = @ac_ct_CC@ 129ac_ct_CC = @ac_ct_CC@
122ac_ct_CXX = @ac_ct_CXX@ 130ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
123ac_ct_F77 = @ac_ct_F77@ 
124am__include = @am__include@ 131am__include = @am__include@
125am__leading_dot = @am__leading_dot@ 132am__leading_dot = @am__leading_dot@
126am__quote = @am__quote@ 133am__quote = @am__quote@
127am__tar = @am__tar@ 134am__tar = @am__tar@
128am__untar = @am__untar@ 135am__untar = @am__untar@
129bindir = @bindir@ 136bindir = @bindir@
130build = @build@ 137build = @build@
131build_alias = @build_alias@ 138build_alias = @build_alias@
132build_cpu = @build_cpu@ 139build_cpu = @build_cpu@
133build_os = @build_os@ 140build_os = @build_os@
134build_vendor = @build_vendor@ 141build_vendor = @build_vendor@
135builddir = @builddir@ 142builddir = @builddir@
136datadir = @datadir@ 143datadir = @datadir@
@@ -141,42 +148,43 @@ exec_prefix = @exec_prefix@ @@ -141,42 +148,43 @@ exec_prefix = @exec_prefix@
141host = @host@ 148host = @host@
142host_alias = @host_alias@ 149host_alias = @host_alias@
143host_cpu = @host_cpu@ 150host_cpu = @host_cpu@
144host_os = @host_os@ 151host_os = @host_os@
145host_vendor = @host_vendor@ 152host_vendor = @host_vendor@
146htmldir = @htmldir@ 153htmldir = @htmldir@
147includedir = @includedir@ 154includedir = @includedir@
148infodir = @infodir@ 155infodir = @infodir@
149install_sh = @install_sh@ 156install_sh = @install_sh@
150libdir = @libdir@ 157libdir = @libdir@
151libexecdir = @libexecdir@ 158libexecdir = @libexecdir@
152localedir = @localedir@ 159localedir = @localedir@
153localstatedir = @localstatedir@ 160localstatedir = @localstatedir@
 161lt_ECHO = @lt_ECHO@
154mandir = @mandir@ 162mandir = @mandir@
155mkdir_p = @mkdir_p@ 163mkdir_p = @mkdir_p@
156oldincludedir = @oldincludedir@ 164oldincludedir = @oldincludedir@
157pdfdir = @pdfdir@ 165pdfdir = @pdfdir@
158prefix = @prefix@ 166prefix = @prefix@
159program_transform_name = @program_transform_name@ 167program_transform_name = @program_transform_name@
160psdir = @psdir@ 168psdir = @psdir@
161sbindir = @sbindir@ 169sbindir = @sbindir@
162sharedstatedir = @sharedstatedir@ 170sharedstatedir = @sharedstatedir@
163srcdir = @srcdir@ 171srcdir = @srcdir@
164sysconfdir = @sysconfdir@ 172sysconfdir = @sysconfdir@
165target_alias = @target_alias@ 173target_alias = @target_alias@
166top_build_prefix = @top_build_prefix@ 174top_build_prefix = @top_build_prefix@
167top_builddir = @top_builddir@ 175top_builddir = @top_builddir@
168top_srcdir = @top_srcdir@ 176top_srcdir = @top_srcdir@
169SUBDIRS = lib netpgp netpgpkeys netpgpverify 177SUBDIRS = libmj lib netpgp netpgpkeys netpgpverify
170all: all-recursive 178all: all-recursive
171 179
172.SUFFIXES: 180.SUFFIXES:
173$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) 181$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
174 @for dep in $?; do \ 182 @for dep in $?; do \
175 case '$(am__configure_deps)' in \ 183 case '$(am__configure_deps)' in \
176 *$$dep*) \ 184 *$$dep*) \
177 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ 185 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
178 && exit 0; \ 186 && exit 0; \
179 exit 1;; \ 187 exit 1;; \
180 esac; \ 188 esac; \
181 done; \ 189 done; \
182 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 190 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cvs diff -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in 2010/07/26 06:39:43 1.8
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in 2010/08/07 04:16:40 1.9
@@ -26,53 +26,53 @@ INSTALL_HEADER = $(INSTALL_DATA) @@ -26,53 +26,53 @@ INSTALL_HEADER = $(INSTALL_DATA)
26transform = $(program_transform_name) 26transform = $(program_transform_name)
27NORMAL_INSTALL = : 27NORMAL_INSTALL = :
28PRE_INSTALL = : 28PRE_INSTALL = :
29POST_INSTALL = : 29POST_INSTALL = :
30NORMAL_UNINSTALL = : 30NORMAL_UNINSTALL = :
31PRE_UNINSTALL = : 31PRE_UNINSTALL = :
32POST_UNINSTALL = : 32POST_UNINSTALL = :
33build_triplet = @build@ 33build_triplet = @build@
34host_triplet = @host@ 34host_triplet = @host@
35subdir = src/lib 35subdir = src/lib
36DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ 36DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
37 $(srcdir)/Makefile.in $(srcdir)/config.h.in mkinstalldirs 37 $(srcdir)/Makefile.in $(srcdir)/config.h.in mkinstalldirs
38ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 38ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
39am__aclocal_m4_deps = $(top_srcdir)/configure.ac 39am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
 40 $(top_srcdir)/configure.ac
40am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 41am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
41 $(ACLOCAL_M4) 42 $(ACLOCAL_M4)
42mkinstalldirs = $(install_sh) -d 43mkinstalldirs = $(install_sh) -d
43CONFIG_HEADER = config.h 44CONFIG_HEADER = config.h
44CONFIG_CLEAN_FILES = 45CONFIG_CLEAN_FILES =
45am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 46am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
46am__vpath_adj = case $$p in \ 47am__vpath_adj = case $$p in \
47 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 48 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
48 *) f=$$p;; \ 49 *) f=$$p;; \
49 esac; 50 esac;
50am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 51am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
51am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" 52am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"
52libLTLIBRARIES_INSTALL = $(INSTALL) 53libLTLIBRARIES_INSTALL = $(INSTALL)
53LTLIBRARIES = $(lib_LTLIBRARIES) 54LTLIBRARIES = $(lib_LTLIBRARIES)
54libnetpgp_la_LIBADD = 55libnetpgp_la_LIBADD =
55am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \ 56am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \
56 libnetpgp_la-compress.lo libnetpgp_la-create.lo \ 57 libnetpgp_la-compress.lo libnetpgp_la-create.lo \
57 libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \ 58 libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \
58 libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \ 59 libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \
59 libnetpgp_la-mj.lo \ 60 libnetpgp_la-mj.lo libnetpgp_la-netpgp.lo \
60 libnetpgp_la-netpgp.lo libnetpgp_la-openssl_crypto.lo \ 61 libnetpgp_la-openssl_crypto.lo libnetpgp_la-packet-parse.lo \
61 libnetpgp_la-packet-parse.lo libnetpgp_la-packet-print.lo \ 62 libnetpgp_la-packet-print.lo libnetpgp_la-packet-show.lo \
62 libnetpgp_la-packet-show.lo libnetpgp_la-reader.lo \ 63 libnetpgp_la-reader.lo libnetpgp_la-signature.lo \
63 libnetpgp_la-signature.lo libnetpgp_la-ssh2pgp.lo \ 64 libnetpgp_la-ssh2pgp.lo libnetpgp_la-symmetric.lo \
64 libnetpgp_la-symmetric.lo libnetpgp_la-validate.lo \ 65 libnetpgp_la-validate.lo libnetpgp_la-writer.lo
65 libnetpgp_la-writer.lo 
66libnetpgp_la_OBJECTS = $(am_libnetpgp_la_OBJECTS) 66libnetpgp_la_OBJECTS = $(am_libnetpgp_la_OBJECTS)
67DEFAULT_INCLUDES = -I.@am__isrc@ 67DEFAULT_INCLUDES = -I.@am__isrc@
68depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp 68depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
69am__depfiles_maybe = depfiles 69am__depfiles_maybe = depfiles
70COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 70COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
71 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 71 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
72LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 72LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
73 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 73 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
74 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 74 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
75CCLD = $(CC) 75CCLD = $(CC)
76LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 76LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
77 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 77 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
78 $(LDFLAGS) -o $@ 78 $(LDFLAGS) -o $@
@@ -88,78 +88,84 @@ ACLOCAL = @ACLOCAL@ @@ -88,78 +88,84 @@ ACLOCAL = @ACLOCAL@
88AMTAR = @AMTAR@ 88AMTAR = @AMTAR@
89AR = @AR@ 89AR = @AR@
90AUTOCONF = @AUTOCONF@ 90AUTOCONF = @AUTOCONF@
91AUTOHEADER = @AUTOHEADER@ 91AUTOHEADER = @AUTOHEADER@
92AUTOM4TE = @AUTOM4TE@ 92AUTOM4TE = @AUTOM4TE@
93AUTOMAKE = @AUTOMAKE@ 93AUTOMAKE = @AUTOMAKE@
94AWK = @AWK@ 94AWK = @AWK@
95CANONICAL_HOST = @CANONICAL_HOST@ 95CANONICAL_HOST = @CANONICAL_HOST@
96CC = @CC@ 96CC = @CC@
97CCDEPMODE = @CCDEPMODE@ 97CCDEPMODE = @CCDEPMODE@
98CFLAGS = @CFLAGS@ 98CFLAGS = @CFLAGS@
99CPP = @CPP@ 99CPP = @CPP@
100CPPFLAGS = @CPPFLAGS@ 100CPPFLAGS = @CPPFLAGS@
101CXX = @CXX@ 
102CXXCPP = @CXXCPP@ 
103CXXDEPMODE = @CXXDEPMODE@ 
104CXXFLAGS = @CXXFLAGS@ 
105CYGPATH_W = @CYGPATH_W@ 101CYGPATH_W = @CYGPATH_W@
106DEFS = @DEFS@ 102DEFS = @DEFS@
107DEPDIR = @DEPDIR@ 103DEPDIR = @DEPDIR@
108ECHO = @ECHO@ 104DSYMUTIL = @DSYMUTIL@
 105DUMPBIN = @DUMPBIN@
109ECHO_C = @ECHO_C@ 106ECHO_C = @ECHO_C@
110ECHO_N = @ECHO_N@ 107ECHO_N = @ECHO_N@
111ECHO_T = @ECHO_T@ 108ECHO_T = @ECHO_T@
112EGREP = @EGREP@ 109EGREP = @EGREP@
113EXEEXT = @EXEEXT@ 110EXEEXT = @EXEEXT@
114F77 = @F77@ 111FGREP = @FGREP@
115FFLAGS = @FFLAGS@ 
116GREP = @GREP@ 112GREP = @GREP@
117INSTALL = @INSTALL@ 113INSTALL = @INSTALL@
118INSTALL_DATA = @INSTALL_DATA@ 114INSTALL_DATA = @INSTALL_DATA@
119INSTALL_PROGRAM = @INSTALL_PROGRAM@ 115INSTALL_PROGRAM = @INSTALL_PROGRAM@
120INSTALL_SCRIPT = @INSTALL_SCRIPT@ 116INSTALL_SCRIPT = @INSTALL_SCRIPT@
121INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 117INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 118LD = @LD@
122LDFLAGS = @LDFLAGS@ 119LDFLAGS = @LDFLAGS@
123LIBOBJS = @LIBOBJS@ 120LIBOBJS = @LIBOBJS@
124LIBS = @LIBS@ 121LIBS = @LIBS@
125LIBTOOL = @LIBTOOL@ 122LIBTOOL = @LIBTOOL@
 123LIPO = @LIPO@
126LN_S = @LN_S@ 124LN_S = @LN_S@
127LTLIBOBJS = @LTLIBOBJS@ 125LTLIBOBJS = @LTLIBOBJS@
128MAINT = @MAINT@ 126MAINT = @MAINT@
129MAKEINFO = @MAKEINFO@ 127MAKEINFO = @MAKEINFO@
130MKDIR_P = @MKDIR_P@ 128MKDIR_P = @MKDIR_P@
 129NM = @NM@
 130NMEDIT = @NMEDIT@
 131OBJDUMP = @OBJDUMP@
131OBJEXT = @OBJEXT@ 132OBJEXT = @OBJEXT@
 133OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 134OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 135OPENSSL_LIBS = @OPENSSL_LIBS@
 136OTOOL = @OTOOL@
 137OTOOL64 = @OTOOL64@
132PACKAGE = @PACKAGE@ 138PACKAGE = @PACKAGE@
133PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 139PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
134PACKAGE_NAME = @PACKAGE_NAME@ 140PACKAGE_NAME = @PACKAGE_NAME@
135PACKAGE_STRING = @PACKAGE_STRING@ 141PACKAGE_STRING = @PACKAGE_STRING@
136PACKAGE_TARNAME = @PACKAGE_TARNAME@ 142PACKAGE_TARNAME = @PACKAGE_TARNAME@
137PACKAGE_VERSION = @PACKAGE_VERSION@ 143PACKAGE_VERSION = @PACKAGE_VERSION@
138PATH_SEPARATOR = @PATH_SEPARATOR@ 144PATH_SEPARATOR = @PATH_SEPARATOR@
 145PKG_CONFIG = @PKG_CONFIG@
139RANLIB = @RANLIB@ 146RANLIB = @RANLIB@
140SED = @SED@ 147SED = @SED@
141SET_MAKE = @SET_MAKE@ 148SET_MAKE = @SET_MAKE@
142SHELL = @SHELL@ 149SHELL = @SHELL@
143STRIP = @STRIP@ 150STRIP = @STRIP@
144VERSION = @VERSION@ 151VERSION = @VERSION@
145WARNCFLAGS = @WARNCFLAGS@ 152WARNCFLAGS = @WARNCFLAGS@
146abs_builddir = @abs_builddir@ 153abs_builddir = @abs_builddir@
147abs_srcdir = @abs_srcdir@ 154abs_srcdir = @abs_srcdir@
148abs_top_builddir = @abs_top_builddir@ 155abs_top_builddir = @abs_top_builddir@
149abs_top_srcdir = @abs_top_srcdir@ 156abs_top_srcdir = @abs_top_srcdir@
150ac_ct_CC = @ac_ct_CC@ 157ac_ct_CC = @ac_ct_CC@
151ac_ct_CXX = @ac_ct_CXX@ 158ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
152ac_ct_F77 = @ac_ct_F77@ 
153am__include = @am__include@ 159am__include = @am__include@
154am__leading_dot = @am__leading_dot@ 160am__leading_dot = @am__leading_dot@
155am__quote = @am__quote@ 161am__quote = @am__quote@
156am__tar = @am__tar@ 162am__tar = @am__tar@
157am__untar = @am__untar@ 163am__untar = @am__untar@
158bindir = @bindir@ 164bindir = @bindir@
159build = @build@ 165build = @build@
160build_alias = @build_alias@ 166build_alias = @build_alias@
161build_cpu = @build_cpu@ 167build_cpu = @build_cpu@
162build_os = @build_os@ 168build_os = @build_os@
163build_vendor = @build_vendor@ 169build_vendor = @build_vendor@
164builddir = @builddir@ 170builddir = @builddir@
165datadir = @datadir@ 171datadir = @datadir@
@@ -170,26 +176,27 @@ exec_prefix = @exec_prefix@ @@ -170,26 +176,27 @@ exec_prefix = @exec_prefix@
170host = @host@ 176host = @host@
171host_alias = @host_alias@ 177host_alias = @host_alias@
172host_cpu = @host_cpu@ 178host_cpu = @host_cpu@
173host_os = @host_os@ 179host_os = @host_os@
174host_vendor = @host_vendor@ 180host_vendor = @host_vendor@
175htmldir = @htmldir@ 181htmldir = @htmldir@
176includedir = @includedir@ 182includedir = @includedir@
177infodir = @infodir@ 183infodir = @infodir@
178install_sh = @install_sh@ 184install_sh = @install_sh@
179libdir = @libdir@ 185libdir = @libdir@
180libexecdir = @libexecdir@ 186libexecdir = @libexecdir@
181localedir = @localedir@ 187localedir = @localedir@
182localstatedir = @localstatedir@ 188localstatedir = @localstatedir@
 189lt_ECHO = @lt_ECHO@
183mandir = @mandir@ 190mandir = @mandir@
184mkdir_p = @mkdir_p@ 191mkdir_p = @mkdir_p@
185oldincludedir = @oldincludedir@ 192oldincludedir = @oldincludedir@
186pdfdir = @pdfdir@ 193pdfdir = @pdfdir@
187prefix = @prefix@ 194prefix = @prefix@
188program_transform_name = @program_transform_name@ 195program_transform_name = @program_transform_name@
189psdir = @psdir@ 196psdir = @psdir@
190sbindir = @sbindir@ 197sbindir = @sbindir@
191sharedstatedir = @sharedstatedir@ 198sharedstatedir = @sharedstatedir@
192srcdir = @srcdir@ 199srcdir = @srcdir@
193sysconfdir = @sysconfdir@ 200sysconfdir = @sysconfdir@
194target_alias = @target_alias@ 201target_alias = @target_alias@
195top_build_prefix = @top_build_prefix@ 202top_build_prefix = @top_build_prefix@
@@ -305,26 +312,27 @@ libnetpgp.la: $(libnetpgp_la_OBJECTS) $( @@ -305,26 +312,27 @@ libnetpgp.la: $(libnetpgp_la_OBJECTS) $(
305mostlyclean-compile: 312mostlyclean-compile:
306 -rm -f *.$(OBJEXT) 313 -rm -f *.$(OBJEXT)
307 314
308distclean-compile: 315distclean-compile:
309 -rm -f *.tab.c 316 -rm -f *.tab.c
310 317
311@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-bufgap.Plo@am__quote@ 318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-bufgap.Plo@am__quote@
312@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-compress.Plo@am__quote@ 319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-compress.Plo@am__quote@
313@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-create.Plo@am__quote@ 320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-create.Plo@am__quote@
314@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-crypto.Plo@am__quote@ 321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-crypto.Plo@am__quote@
315@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-fastctype.Plo@am__quote@ 322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-fastctype.Plo@am__quote@
316@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-keyring.Plo@am__quote@ 323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-keyring.Plo@am__quote@
317@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-misc.Plo@am__quote@ 324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-misc.Plo@am__quote@
 325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-mj.Plo@am__quote@
318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-netpgp.Plo@am__quote@ 326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-netpgp.Plo@am__quote@
319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-openssl_crypto.Plo@am__quote@ 327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-openssl_crypto.Plo@am__quote@
320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-parse.Plo@am__quote@ 328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-parse.Plo@am__quote@
321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-print.Plo@am__quote@ 329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-print.Plo@am__quote@
322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-show.Plo@am__quote@ 330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-packet-show.Plo@am__quote@
323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-reader.Plo@am__quote@ 331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-reader.Plo@am__quote@
324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-signature.Plo@am__quote@ 332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-signature.Plo@am__quote@
325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-ssh2pgp.Plo@am__quote@ 333@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-ssh2pgp.Plo@am__quote@
326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-symmetric.Plo@am__quote@ 334@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-symmetric.Plo@am__quote@
327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-validate.Plo@am__quote@ 335@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-validate.Plo@am__quote@
328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-writer.Plo@am__quote@ 336@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-writer.Plo@am__quote@
329 337
330.c.o: 338.c.o:
cvs diff -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in 2009/05/26 05:03:57 1.8
+++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in 2010/08/07 04:16:40 1.9
@@ -104,26 +104,30 @@ @@ -104,26 +104,30 @@
104 104
105/* Define to 1 if you have the <sys/types.h> header file. */ 105/* Define to 1 if you have the <sys/types.h> header file. */
106#undef HAVE_SYS_TYPES_H 106#undef HAVE_SYS_TYPES_H
107 107
108/* Define to 1 if you have the <sys/uio.h> header file. */ 108/* Define to 1 if you have the <sys/uio.h> header file. */
109#undef HAVE_SYS_UIO_H 109#undef HAVE_SYS_UIO_H
110 110
111/* Define to 1 if you have the <unistd.h> header file. */ 111/* Define to 1 if you have the <unistd.h> header file. */
112#undef HAVE_UNISTD_H 112#undef HAVE_UNISTD_H
113 113
114/* Define to 1 if you have the <zlib.h> header file. */ 114/* Define to 1 if you have the <zlib.h> header file. */
115#undef HAVE_ZLIB_H 115#undef HAVE_ZLIB_H
116 116
 117/* Define to the sub-directory in which libtool stores uninstalled libraries.
 118 */
 119#undef LT_OBJDIR
 120
117/* Name of package */ 121/* Name of package */
118#undef PACKAGE 122#undef PACKAGE
119 123
120/* Define to the address where bug reports for this package should be sent. */ 124/* Define to the address where bug reports for this package should be sent. */
121#undef PACKAGE_BUGREPORT 125#undef PACKAGE_BUGREPORT
122 126
123/* Define to the full name of this package. */ 127/* Define to the full name of this package. */
124#undef PACKAGE_NAME 128#undef PACKAGE_NAME
125 129
126/* Define to the full name and version of this package. */ 130/* Define to the full name and version of this package. */
127#undef PACKAGE_STRING 131#undef PACKAGE_STRING
128 132
129/* Define to the one symbol short name of this package. */ 133/* Define to the one symbol short name of this package. */
cvs diff -r1.39 -r1.40 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c 2010/07/09 05:35:34 1.39
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c 2010/08/07 04:16:40 1.40
@@ -47,27 +47,27 @@ @@ -47,27 +47,27 @@
47 * limitations under the License. 47 * limitations under the License.
48 */ 48 */
49 49
50/** \file 50/** \file
51 */ 51 */
52#include "config.h" 52#include "config.h"
53 53
54#ifdef HAVE_SYS_CDEFS_H 54#ifdef HAVE_SYS_CDEFS_H
55#include <sys/cdefs.h> 55#include <sys/cdefs.h>
56#endif 56#endif
57 57
58#if defined(__NetBSD__) 58#if defined(__NetBSD__)
59__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); 59__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
60__RCSID("$NetBSD: keyring.c,v 1.39 2010/07/09 05:35:34 agc Exp $"); 60__RCSID("$NetBSD: keyring.c,v 1.40 2010/08/07 04:16:40 agc Exp $");
61#endif 61#endif
62 62
63#ifdef HAVE_FCNTL_H 63#ifdef HAVE_FCNTL_H
64#include <fcntl.h> 64#include <fcntl.h>
65#endif 65#endif
66 66
67#include <regex.h> 67#include <regex.h>
68#include <stdlib.h> 68#include <stdlib.h>
69#include <string.h> 69#include <string.h>
70 70
71#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
72#include <termios.h> 72#include <termios.h>
73#endif 73#endif
@@ -985,26 +985,64 @@ __ops_keyring_list(__ops_io_t *io, const @@ -985,26 +985,64 @@ __ops_keyring_list(__ops_io_t *io, const
985 (keyring->keyc == 1) ? "" : "s"); 985 (keyring->keyc == 1) ? "" : "s");
986 for (n = 0, key = keyring->keys; n < keyring->keyc; ++n, ++key) { 986 for (n = 0, key = keyring->keys; n < keyring->keyc; ++n, ++key) {
987 if (__ops_is_key_secret(key)) { 987 if (__ops_is_key_secret(key)) {
988 __ops_print_keydata(io, keyring, key, "sec", 988 __ops_print_keydata(io, keyring, key, "sec",
989 &key->key.seckey.pubkey, 0); 989 &key->key.seckey.pubkey, 0);
990 } else { 990 } else {
991 __ops_print_keydata(io, keyring, key, "pub", &key->key.pubkey, psigs); 991 __ops_print_keydata(io, keyring, key, "pub", &key->key.pubkey, psigs);
992 } 992 }
993 (void) fputc('\n', io->res); 993 (void) fputc('\n', io->res);
994 } 994 }
995 return 1; 995 return 1;
996} 996}
997 997
 998int
 999__ops_keyring_json(__ops_io_t *io, const __ops_keyring_t *keyring, mj_t *obj, const int psigs)
 1000{
 1001 __ops_key_t *key;
 1002 unsigned n;
 1003
 1004 (void) memset(obj, 0x0, sizeof(*obj));
 1005 mj_create(obj, "array");
 1006 obj->size = keyring->keyvsize;
 1007 if (__ops_get_debug_level(__FILE__)) {
 1008 (void) fprintf(io->errs, "__ops_keyring_json: vsize %u\n", obj->size);
 1009 }
 1010 if ((obj->value.v = calloc(sizeof(*obj->value.v), obj->size)) == NULL) {
 1011 (void) fprintf(io->errs, "calloc failure\n");
 1012 return 0;
 1013 }
 1014 for (n = 0, key = keyring->keys; n < keyring->keyc; ++n, ++key) {
 1015 if (__ops_is_key_secret(key)) {
 1016 __ops_sprint_mj(io, keyring, key, &obj->value.v[obj->c],
 1017 "sec", &key->key.seckey.pubkey, psigs);
 1018 } else {
 1019 __ops_sprint_mj(io, keyring, key, &obj->value.v[obj->c],
 1020 "pub", &key->key.pubkey, psigs);
 1021 }
 1022 if (obj->value.v[obj->c].type != 0) {
 1023 obj->c += 1;
 1024 }
 1025 }
 1026 if (__ops_get_debug_level(__FILE__)) {
 1027 char *s;
 1028
 1029 mj_asprint(&s, obj);
 1030 (void) fprintf(stderr, "__ops_keyring_json: '%s'\n", s);
 1031 free(s);
 1032 }
 1033 return 1;
 1034}
 1035
998 1036
999/* this interface isn't right - hook into callback for getting passphrase */ 1037/* this interface isn't right - hook into callback for getting passphrase */
1000char * 1038char *
1001__ops_export_key(__ops_io_t *io, const __ops_key_t *keydata, uint8_t *passphrase) 1039__ops_export_key(__ops_io_t *io, const __ops_key_t *keydata, uint8_t *passphrase)
1002{ 1040{
1003 __ops_output_t *output; 1041 __ops_output_t *output;
1004 __ops_memory_t *mem; 1042 __ops_memory_t *mem;
1005 char *cp; 1043 char *cp;
1006 1044
1007 __OPS_USED(io); 1045 __OPS_USED(io);
1008 __ops_setup_memory_write(&output, &mem, 128); 1046 __ops_setup_memory_write(&output, &mem, 128);
1009 if (keydata->type == OPS_PTAG_CT_PUBLIC_KEY) { 1047 if (keydata->type == OPS_PTAG_CT_PUBLIC_KEY) {
1010 __ops_write_xfer_pubkey(output, keydata, 1); 1048 __ops_write_xfer_pubkey(output, keydata, 1);
cvs diff -r1.28 -r1.29 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h 2010/07/26 06:37:35 1.28
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h 2010/08/07 04:16:40 1.29
@@ -86,51 +86,52 @@ const __ops_key_t *__ops_getnextkeybynam @@ -86,51 +86,52 @@ const __ops_key_t *__ops_getnextkeybynam
86void __ops_keydata_free(__ops_key_t *); 86void __ops_keydata_free(__ops_key_t *);
87void __ops_keyring_free(__ops_keyring_t *); 87void __ops_keyring_free(__ops_keyring_t *);
88void __ops_dump_keyring(const __ops_keyring_t *); 88void __ops_dump_keyring(const __ops_keyring_t *);
89const __ops_pubkey_t *__ops_get_pubkey(const __ops_key_t *); 89const __ops_pubkey_t *__ops_get_pubkey(const __ops_key_t *);
90unsigned __ops_is_key_secret(const __ops_key_t *); 90unsigned __ops_is_key_secret(const __ops_key_t *);
91const __ops_seckey_t *__ops_get_seckey(const __ops_key_t *); 91const __ops_seckey_t *__ops_get_seckey(const __ops_key_t *);
92__ops_seckey_t *__ops_get_writable_seckey(__ops_key_t *); 92__ops_seckey_t *__ops_get_writable_seckey(__ops_key_t *);
93__ops_seckey_t *__ops_decrypt_seckey(const __ops_key_t *, void *); 93__ops_seckey_t *__ops_decrypt_seckey(const __ops_key_t *, void *);
94 94
95unsigned __ops_keyring_fileread(__ops_keyring_t *, const unsigned, 95unsigned __ops_keyring_fileread(__ops_keyring_t *, const unsigned,
96 const char *); 96 const char *);
97 97
98int __ops_keyring_list(__ops_io_t *, const __ops_keyring_t *, const int); 98int __ops_keyring_list(__ops_io_t *, const __ops_keyring_t *, const int);
 99int __ops_keyring_json(__ops_io_t *, const __ops_keyring_t *, mj_t *, const int);
99 100
100void __ops_set_seckey(__ops_contents_t *, const __ops_key_t *); 101void __ops_set_seckey(__ops_contents_t *, const __ops_key_t *);
101void __ops_forget(void *, unsigned); 102void __ops_forget(void *, unsigned);
102 103
103const uint8_t *__ops_get_key_id(const __ops_key_t *); 104const uint8_t *__ops_get_key_id(const __ops_key_t *);
104unsigned __ops_get_userid_count(const __ops_key_t *); 105unsigned __ops_get_userid_count(const __ops_key_t *);
105const uint8_t *__ops_get_userid(const __ops_key_t *, unsigned); 106const uint8_t *__ops_get_userid(const __ops_key_t *, unsigned);
106unsigned __ops_is_key_supported(const __ops_key_t *); 107unsigned __ops_is_key_supported(const __ops_key_t *);
107 108
108uint8_t *__ops_add_userid(__ops_key_t *, const uint8_t *); 109uint8_t *__ops_add_userid(__ops_key_t *, const uint8_t *);
109__ops_subpacket_t *__ops_add_subpacket(__ops_key_t *, 110__ops_subpacket_t *__ops_add_subpacket(__ops_key_t *,
110 const __ops_subpacket_t *); 111 const __ops_subpacket_t *);
111 112
112unsigned __ops_add_selfsigned_userid(__ops_key_t *, uint8_t *); 113unsigned __ops_add_selfsigned_userid(__ops_key_t *, uint8_t *);
113 114
114__ops_key_t *__ops_keydata_new(void); 115__ops_key_t *__ops_keydata_new(void);
115void __ops_keydata_init(__ops_key_t *, const __ops_content_enum); 116void __ops_keydata_init(__ops_key_t *, const __ops_content_enum);
116 117
117int __ops_parse_and_accumulate(__ops_keyring_t *, __ops_stream_t *); 118int __ops_parse_and_accumulate(__ops_keyring_t *, __ops_stream_t *);
118 119
119int __ops_sprint_keydata(__ops_io_t *, const __ops_keyring_t *, 120int __ops_sprint_keydata(__ops_io_t *, const __ops_keyring_t *,
120 const __ops_key_t *, char **, const char *, 121 const __ops_key_t *, char **, const char *,
121 const __ops_pubkey_t *, const int); 122 const __ops_pubkey_t *, const int);
122int __ops_sprint_mj(__ops_io_t *, const __ops_keyring_t *, 123int __ops_sprint_mj(__ops_io_t *, const __ops_keyring_t *,
123 const __ops_key_t *, char **, const char *, 124 const __ops_key_t *, mj_t *, const char *,
124 const __ops_pubkey_t *, const int); 125 const __ops_pubkey_t *, const int);
125int __ops_hkp_sprint_keydata(__ops_io_t *, const __ops_keyring_t *, 126int __ops_hkp_sprint_keydata(__ops_io_t *, const __ops_keyring_t *,
126 const __ops_key_t *, char **, 127 const __ops_key_t *, char **,
127 const __ops_pubkey_t *, const int); 128 const __ops_pubkey_t *, const int);
128void __ops_print_keydata(__ops_io_t *, const __ops_keyring_t *, const __ops_key_t *, 129void __ops_print_keydata(__ops_io_t *, const __ops_keyring_t *, const __ops_key_t *,
129 const char *, const __ops_pubkey_t *, const int); 130 const char *, const __ops_pubkey_t *, const int);
130void __ops_print_sig(__ops_io_t *, const __ops_key_t *, const char *, 131void __ops_print_sig(__ops_io_t *, const __ops_key_t *, const char *,
131 const __ops_pubkey_t *); 132 const __ops_pubkey_t *);
132void __ops_print_pubkey(const __ops_pubkey_t *); 133void __ops_print_pubkey(const __ops_pubkey_t *);
133int __ops_sprint_pubkey(const __ops_key_t *, char *, size_t); 134int __ops_sprint_pubkey(const __ops_key_t *, char *, size_t);
134 135
135int __ops_list_packets(__ops_io_t *, 136int __ops_list_packets(__ops_io_t *,
136 char *, 137 char *,
cvs diff -r1.65 -r1.66 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c 2010/07/09 14:45:43 1.65
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c 2010/08/07 04:16:40 1.66
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29#include "config.h" 29#include "config.h"
30 30
31#ifdef HAVE_SYS_CDEFS_H 31#ifdef HAVE_SYS_CDEFS_H
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#endif 33#endif
34 34
35#if defined(__NetBSD__) 35#if defined(__NetBSD__)
36__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); 36__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
37__RCSID("$NetBSD: netpgp.c,v 1.65 2010/07/09 14:45:43 agc Exp $"); 37__RCSID("$NetBSD: netpgp.c,v 1.66 2010/08/07 04:16:40 agc Exp $");
38#endif 38#endif
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/stat.h> 41#include <sys/stat.h>
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/mman.h> 43#include <sys/mman.h>
44 44
45#ifdef HAVE_SYS_RESOURCE_H 45#ifdef HAVE_SYS_RESOURCE_H
46#include <sys/resource.h> 46#include <sys/resource.h>
47#endif 47#endif
48 48
49#ifdef HAVE_FCNTL_H 49#ifdef HAVE_FCNTL_H
50#include <fcntl.h> 50#include <fcntl.h>
@@ -621,26 +621,47 @@ netpgp_end(netpgp_t *netpgp) @@ -621,26 +621,47 @@ netpgp_end(netpgp_t *netpgp)
621} 621}
622 622
623/* list the keys in a keyring */ 623/* list the keys in a keyring */
624int 624int
625netpgp_list_keys(netpgp_t *netpgp, const int psigs) 625netpgp_list_keys(netpgp_t *netpgp, const int psigs)
626{ 626{
627 if (netpgp->pubring == NULL) { 627 if (netpgp->pubring == NULL) {
628 (void) fprintf(stderr, "No keyring\n"); 628 (void) fprintf(stderr, "No keyring\n");
629 return 0; 629 return 0;
630 } 630 }
631 return __ops_keyring_list(netpgp->io, netpgp->pubring, psigs); 631 return __ops_keyring_list(netpgp->io, netpgp->pubring, psigs);
632} 632}
633 633
 634/* list the keys in a keyring, returning a JSON string */
 635int
 636netpgp_list_keys_json(netpgp_t *netpgp, char **json, const int psigs)
 637{
 638 mj_t obj;
 639 int ret;
 640
 641 if (netpgp->pubring == NULL) {
 642 (void) fprintf(stderr, "No keyring\n");
 643 return 0;
 644 }
 645 (void) memset(&obj, 0x0, sizeof(obj));
 646 if (!__ops_keyring_json(netpgp->io, netpgp->pubring, &obj, psigs)) {
 647 (void) fprintf(stderr, "No keys in keyring\n");
 648 return 0;
 649 }
 650 ret = mj_asprint(json, &obj);
 651 mj_delete(&obj);
 652 return ret;
 653}
 654
634DEFINE_ARRAY(strings_t, char *); 655DEFINE_ARRAY(strings_t, char *);
635 656
636#ifndef HKP_VERSION 657#ifndef HKP_VERSION
637#define HKP_VERSION 1 658#define HKP_VERSION 1
638#endif 659#endif
639 660
640/* find and list some keys in a keyring */ 661/* find and list some keys in a keyring */
641int 662int
642netpgp_match_keys(netpgp_t *netpgp, char *name, const char *fmt, void *vp, const int psigs) 663netpgp_match_keys(netpgp_t *netpgp, char *name, const char *fmt, void *vp, const int psigs)
643{ 664{
644 const __ops_key_t *key; 665 const __ops_key_t *key;
645 unsigned k; 666 unsigned k;
646 strings_t pubs; 667 strings_t pubs;
@@ -677,26 +698,68 @@ netpgp_match_keys(netpgp_t *netpgp, char @@ -677,26 +698,68 @@ netpgp_match_keys(netpgp_t *netpgp, char
677 (void) fprintf(fp, "info:%d:%d\n", HKP_VERSION, pubs.c); 698 (void) fprintf(fp, "info:%d:%d\n", HKP_VERSION, pubs.c);
678 } else { 699 } else {
679 (void) fprintf(fp, "%d key%s found\n", pubs.c, 700 (void) fprintf(fp, "%d key%s found\n", pubs.c,
680 (pubs.c == 1) ? "" : "s"); 701 (pubs.c == 1) ? "" : "s");
681 } 702 }
682 for (k = 0 ; k < pubs.c ; k++) { 703 for (k = 0 ; k < pubs.c ; k++) {
683 (void) fprintf(fp, "%s%s", pubs.v[k], (k < pubs.c - 1) ? "\n" : ""); 704 (void) fprintf(fp, "%s%s", pubs.v[k], (k < pubs.c - 1) ? "\n" : "");
684 free(pubs.v[k]); 705 free(pubs.v[k]);
685 } 706 }
686 free(pubs.v); 707 free(pubs.v);
687 return pubs.c; 708 return pubs.c;
688} 709}
689 710
 711/* find and list some keys in a keyring - return JSON string */
 712int
 713netpgp_match_keys_json(netpgp_t *netpgp, char **json, char *name, const char *fmt, const int psigs)
 714{
 715 const __ops_key_t *key;
 716 unsigned k;
 717 mj_t id_array;
 718 int ret;
 719
 720 if (name[0] == '0' && name[1] == 'x') {
 721 name += 2;
 722 }
 723 (void) memset(&id_array, 0x0, sizeof(id_array));
 724 k = 0;
 725 *json = NULL;
 726 mj_create(&id_array, "array");
 727 do {
 728 key = __ops_getnextkeybyname(netpgp->io, netpgp->pubring,
 729 name, &k);
 730 if (key != NULL) {
 731 if (strcmp(fmt, "mr") == 0) {
 732#if 0
 733 __ops_hkp_sprint_keydata(netpgp->io, netpgp->pubring,
 734 key, &pubs.v[pubs.c],
 735 &key->key.pubkey, psigs);
 736#endif
 737 } else {
 738 ALLOC(mj_t, id_array.value.v, id_array.size,
 739 id_array.c, 10, 10, "netpgp_match_keys_json", return 0);
 740 __ops_sprint_mj(netpgp->io, netpgp->pubring,
 741 key, &id_array.value.v[id_array.c++],
 742 "pub",
 743 &key->key.pubkey, psigs);
 744 }
 745 k += 1;
 746 }
 747 } while (key != NULL);
 748 ret = mj_asprint(json, &id_array);
 749 mj_delete(&id_array);
 750 return ret;
 751}
 752
690/* find and list some public keys in a keyring */ 753/* find and list some public keys in a keyring */
691int 754int
692netpgp_match_pubkeys(netpgp_t *netpgp, char *name, void *vp) 755netpgp_match_pubkeys(netpgp_t *netpgp, char *name, void *vp)
693{ 756{
694 const __ops_key_t *key; 757 const __ops_key_t *key;
695 unsigned k; 758 unsigned k;
696 strings_t pubs; 759 strings_t pubs;
697 FILE *fp = (FILE *)vp; 760 FILE *fp = (FILE *)vp;
698 761
699 (void) memset(&pubs, 0x0, sizeof(pubs)); 762 (void) memset(&pubs, 0x0, sizeof(pubs));
700 do { 763 do {
701 key = __ops_getnextkeybyname(netpgp->io, netpgp->pubring, 764 key = __ops_getnextkeybyname(netpgp->io, netpgp->pubring,
702 name, &k); 765 name, &k);
cvs diff -r1.34 -r1.35 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c 2010/07/26 06:37:35 1.34
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c 2010/08/07 04:16:40 1.35
@@ -48,27 +48,27 @@ @@ -48,27 +48,27 @@
48 */ 48 */
49 49
50/* 50/*
51 * ! \file \brief Standard API print functions 51 * ! \file \brief Standard API print functions
52 */ 52 */
53#include "config.h" 53#include "config.h"
54 54
55#ifdef HAVE_SYS_CDEFS_H 55#ifdef HAVE_SYS_CDEFS_H
56#include <sys/cdefs.h> 56#include <sys/cdefs.h>
57#endif 57#endif
58 58
59#if defined(__NetBSD__) 59#if defined(__NetBSD__)
60__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); 60__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
61__RCSID("$NetBSD: packet-print.c,v 1.34 2010/07/26 06:37:35 agc Exp $"); 61__RCSID("$NetBSD: packet-print.c,v 1.35 2010/08/07 04:16:40 agc Exp $");
62#endif 62#endif
63 63
64#include <string.h> 64#include <string.h>
65#include <stdio.h> 65#include <stdio.h>
66 66
67#ifdef HAVE_UNISTD_H 67#ifdef HAVE_UNISTD_H
68#include <unistd.h> 68#include <unistd.h>
69#endif 69#endif
70 70
71#include "crypto.h" 71#include "crypto.h"
72#include "keyring.h" 72#include "keyring.h"
73#include "packet-show.h" 73#include "packet-show.h"
74#include "signature.h" 74#include "signature.h"
@@ -463,127 +463,110 @@ __ops_sprint_keydata(__ops_io_t *io, con @@ -463,127 +463,110 @@ __ops_sprint_keydata(__ops_io_t *io, con
463 } 463 }
464 } 464 }
465 return __ops_asprintf(buf, "%s %d/%s %s %s %s\nKey fingerprint: %s\n%s", 465 return __ops_asprintf(buf, "%s %d/%s %s %s %s\nKey fingerprint: %s\n%s",
466 header, 466 header,
467 numkeybits(pubkey), 467 numkeybits(pubkey),
468 __ops_show_pka(pubkey->alg), 468 __ops_show_pka(pubkey->alg),
469 strhexdump(keyid, key->key_id, OPS_KEY_ID_SIZE, ""), 469 strhexdump(keyid, key->key_id, OPS_KEY_ID_SIZE, ""),
470 ptimestr(t, sizeof(t), pubkey->birthtime), 470 ptimestr(t, sizeof(t), pubkey->birthtime),
471 expired, 471 expired,
472 strhexdump(fp, key->fingerprint.fingerprint, key->fingerprint.length, " "), 472 strhexdump(fp, key->fingerprint.fingerprint, key->fingerprint.length, " "),
473 uidbuf); 473 uidbuf);
474} 474}
475 475
 476/* return the key info as a JSON encoded string */
476int 477int
477__ops_sprint_mj(__ops_io_t *io, const __ops_keyring_t *keyring, 478__ops_sprint_mj(__ops_io_t *io, const __ops_keyring_t *keyring,
478 const __ops_key_t *key, char **buf, const char *header, 479 const __ops_key_t *key, mj_t *keyjson, const char *header,
479 const __ops_pubkey_t *pubkey, const int psigs) 480 const __ops_pubkey_t *pubkey, const int psigs)
480{ 481{
481 const __ops_key_t *trustkey; 482 const __ops_key_t *trustkey;
482 unsigned from; 483 unsigned from;
483 unsigned i; 484 unsigned i;
484 unsigned j; 485 unsigned j;
485 time_t now; 486 mj_t sub_obj;
486 mj_t expired_obj; 
487 mj_t uids_array; 
488 mj_t sig_array; 
489 mj_t sig_obj; 
490 mj_t key_obj; 
491 char uidbuf[KB(64)]; 
492 char keyid[OPS_KEY_ID_SIZE * 3]; 487 char keyid[OPS_KEY_ID_SIZE * 3];
493 char fp[(OPS_FINGERPRINT_SIZE * 3) + 1]; 488 char fp[(OPS_FINGERPRINT_SIZE * 3) + 1];
494 int r; 489 int r;
495 490
496 if (key == NULL || key->revoked) { 491 if (key == NULL || key->revoked) {
497 return -1; 492 return -1;
498 } 493 }
499 (void) memset(uidbuf, 0x0, sizeof(uidbuf)); 494 (void) memset(keyjson, 0x0, sizeof(*keyjson));
500 (void) memset(&key_obj, 0x0, sizeof(key_obj)); 495 mj_create(keyjson, "object");
501 mj_create(&key_obj, "object"); 496 mj_append_field(keyjson, "header", "string", header);
502 mj_append_field(&key_obj, "header", "string", header); 497 mj_append_field(keyjson, "key bits", "integer", (int64_t) numkeybits(pubkey));
503 mj_append_field(&key_obj, "key bits", "integer", (int64_t) numkeybits(pubkey)); 498 mj_append_field(keyjson, "pka", "string", __ops_show_pka(pubkey->alg));
504 mj_append_field(&key_obj, "pka", "string", __ops_show_pka(pubkey->alg)); 499 mj_append_field(keyjson, "key id", "string", strhexdump(keyid, key->key_id, OPS_KEY_ID_SIZE, ""));
505 mj_append_field(&key_obj, "key id", "string", strhexdump(keyid, key->key_id, OPS_KEY_ID_SIZE, "")); 500 mj_append_field(keyjson, "fingerprint", "string",
506 mj_append(&key_obj, "fingerprint", "string", 
507 strhexdump(fp, key->fingerprint.fingerprint, key->fingerprint.length, " ")); 501 strhexdump(fp, key->fingerprint.fingerprint, key->fingerprint.length, " "));
508 now = time(NULL); 502 mj_append_field(keyjson, "birthtime", "integer", pubkey->birthtime);
509 mj_append_field(&key_obj, "birthtime", "integer", pubkey->birthtime); 503 mj_append_field(keyjson, "duration", "integer", pubkey->duration);
510 mj_append_field(&key_obj, "duration", "integer", pubkey->duration); 
511 if (pubkey->duration > 0) { 
512 (void) memset(&expired_obj, 0x0, sizeof(expired_obj)); 
513 mj_append_field(&expired_obj, "expiry status", "string", 
514 (pubkey->birthtime + pubkey->duration < now) ? "[EXPIRED]" : "[EXPIRES]"); 
515 mj_append_field(&expired_obj, "expiry", "integer", 
516 (int64_t)(pubkey->birthtime + pubkey->duration)); 
517 mj_append_field(&key_obj, "expiration", "object", &expired_obj); 
518 } 
519 (void) memset(&uids_array, 0x0, sizeof(uids_array)); 
520 mj_create(&uids_array, "array"); 
521 for (i = 0; i < key->uidc; i++) { 504 for (i = 0; i < key->uidc; i++) {
522 if ((r = isrevoked(key, i)) >= 0 && 505 if ((r = isrevoked(key, i)) >= 0 &&
523 key->revokes[r].code == OPS_REVOCATION_COMPROMISED) { 506 key->revokes[r].code == OPS_REVOCATION_COMPROMISED) {
524 continue; 507 continue;
525 } 508 }
526 mj_append(&uids_array, "string", key->uids[i]); 509 (void) memset(&sub_obj, 0x0, sizeof(sub_obj));
527 mj_append(&uids_array, "integer", r); 510 mj_create(&sub_obj, "array");
528 (void) memset(&sig_array, 0x0, sizeof(sig_array)); 511 mj_append(&sub_obj, "string", key->uids[i]);
529 mj_create(&sig_array, "array"); 512 mj_append(&sub_obj, "string", (r >= 0) ? "[REVOKED]" : "");
 513 mj_append_field(keyjson, "uid", "array", &sub_obj);
 514 mj_delete(&sub_obj);
530 for (j = 0 ; j < key->subsigc ; j++) { 515 for (j = 0 ; j < key->subsigc ; j++) {
531 (void) memset(&sig_obj, 0x0, sizeof(sig_obj)); 
532 mj_create(&sig_obj, "object"); 
533 if (psigs) { 516 if (psigs) {
534 if (key->subsigs[j].uid != i) { 517 if (key->subsigs[j].uid != i) {
535 continue; 518 continue;
536 } 519 }
537 } else { 520 } else {
538 if (!(key->subsigs[j].sig.info.version == 4 && 521 if (!(key->subsigs[j].sig.info.version == 4 &&
539 key->subsigs[j].sig.info.type == OPS_SIG_SUBKEY && 522 key->subsigs[j].sig.info.type == OPS_SIG_SUBKEY &&
540 i == key->uidc - 1)) { 523 i == key->uidc - 1)) {
541 continue; 524 continue;
542 } 525 }
543 } 526 }
544 mj_append_field(&sig_obj, "pgp version", "integer", (int64_t)key->subsigs[j].sig.info.version); 527 (void) memset(&sub_obj, 0x0, sizeof(sub_obj));
 528 mj_create(&sub_obj, "array");
545 if (key->subsigs[j].sig.info.version == 4 && 529 if (key->subsigs[j].sig.info.version == 4 &&
546 key->subsigs[j].sig.info.type == OPS_SIG_SUBKEY) { 530 key->subsigs[j].sig.info.type == OPS_SIG_SUBKEY) {
547 mj_append_field(&sig_obj, "header", "string", "sub"); 531 mj_append(&sub_obj, "integer", (int64_t)numkeybits(pubkey));
548 mj_append_field(&sig_obj, "key size", "integer", (int64_t)numkeybits(pubkey)); 532 mj_append(&sub_obj, "string",
549 mj_append_field(&sig_obj, "pka", "string", 
550 (const char *)__ops_show_pka(key->subsigs[j].sig.info.key_alg)); 533 (const char *)__ops_show_pka(key->subsigs[j].sig.info.key_alg));
551 mj_append_field(&sig_obj, "signer", "string", 534 mj_append(&sub_obj, "string",
552 strhexdump(keyid, key->subsigs[j].sig.info.signer_id, OPS_KEY_ID_SIZE, "")); 535 strhexdump(keyid, key->subsigs[j].sig.info.signer_id, OPS_KEY_ID_SIZE, ""));
553 mj_append_field(&sig_obj, "signtime", "integer", 536 mj_append(&sub_obj, "integer", (int64_t)key->subsigs[j].sig.info.birthtime);
554 (int64_t)key->subsigs[j].sig.info.birthtime); 537 mj_append_field(keyjson, "sub", "array", &sub_obj);
 538 mj_delete(&sub_obj);
555 } else { 539 } else {
556 mj_append_field(&sig_obj, "signer", "string", 540 mj_append(&sub_obj, "string",
557 strhexdump(keyid, key->subsigs[j].sig.info.signer_id, OPS_KEY_ID_SIZE, "")); 541 strhexdump(keyid, key->subsigs[j].sig.info.signer_id, OPS_KEY_ID_SIZE, ""));
558 mj_append_field(&sig_obj, "signtime", "integer", 542 mj_append(&sub_obj, "integer",
559 (int64_t)(key->subsigs[j].sig.info.birthtime)); 543 (int64_t)(key->subsigs[j].sig.info.birthtime));
560 from = 0; 544 from = 0;
561 trustkey = __ops_getkeybyid(io, keyring, key->subsigs[j].sig.info.signer_id, &from); 545 trustkey = __ops_getkeybyid(io, keyring, key->subsigs[j].sig.info.signer_id, &from);
562 mj_append_field(&sig_obj, "trustkey", "string", 546 mj_append(&sub_obj, "string",
563 (trustkey) ? (char *)trustkey->uids[trustkey->uid0] : "[unknown]"); 547 (trustkey) ? (char *)trustkey->uids[trustkey->uid0] : "[unknown]");
 548 mj_append_field(keyjson, "sig", "array", &sub_obj);
 549 mj_delete(&sub_obj);
564 } 550 }
565 mj_append(&sig_array, "object", &sig_obj); 
566 mj_delete(&sig_obj); 
567 } 
568 if (mj_arraycount(&sig_array) > 0) { 
569 mj_append(&uids_array, "array", &sig_array); 
570 } 551 }
571 mj_delete(&sig_array); 
572 } 552 }
573 mj_append_field(&key_obj, "uids", "array", &uids_array); 553 if (__ops_get_debug_level(__FILE__)) {
574 mj_delete(&uids_array); 554 char *buf;
575 mj_asprint(buf, &key_obj); 555
576 mj_delete(&key_obj); 556 mj_asprint(&buf, keyjson);
 557 (void) fprintf(stderr, "__ops_sprint_mj: '%s'\n", buf);
 558 free(buf);
 559 }
577 return 1; 560 return 1;
578} 561}
579 562
580int 563int
581__ops_hkp_sprint_keydata(__ops_io_t *io, const __ops_keyring_t *keyring, 564__ops_hkp_sprint_keydata(__ops_io_t *io, const __ops_keyring_t *keyring,
582 const __ops_key_t *key, char **buf, 565 const __ops_key_t *key, char **buf,
583 const __ops_pubkey_t *pubkey, const int psigs) 566 const __ops_pubkey_t *pubkey, const int psigs)
584{ 567{
585 const __ops_key_t *trustkey; 568 const __ops_key_t *trustkey;
586 unsigned from; 569 unsigned from;
587 unsigned i; 570 unsigned i;
588 unsigned j; 571 unsigned j;
589 char keyid[OPS_KEY_ID_SIZE * 3]; 572 char keyid[OPS_KEY_ID_SIZE * 3];
cvs diff -r1.37 -r1.38 src/crypto/external/bsd/netpgp/dist/src/lib/version.h (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h 2010/07/09 05:35:35 1.37
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h 2010/08/07 04:16:40 1.38
@@ -48,20 +48,20 @@ @@ -48,20 +48,20 @@
48 */ 48 */
49#ifndef VERSION_H_ 49#ifndef VERSION_H_
50#define VERSION_H_ 1 50#define VERSION_H_ 1
51 51
52#ifndef NETPGP_AUTOCONF_VERSION 52#ifndef NETPGP_AUTOCONF_VERSION
53#define NETPGP_AUTOCONF_VERSION PACKAGE_VERSION 53#define NETPGP_AUTOCONF_VERSION PACKAGE_VERSION
54#endif 54#endif
55 55
56#ifndef NETPGP_MAINTAINER 56#ifndef NETPGP_MAINTAINER
57#define NETPGP_MAINTAINER PACKAGE_BUGREPORT 57#define NETPGP_MAINTAINER PACKAGE_BUGREPORT
58#endif 58#endif
59 59
60/* development versions have .99 suffix */ 60/* development versions have .99 suffix */
61#define NETPGP_BASE_VERSION "3.99.7" 61#define NETPGP_BASE_VERSION "3.99.8"
62 62
63#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]" 63#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
64#define NETPGP_VERSION_STRING \ 64#define NETPGP_VERSION_STRING \
65 NETPGP_VERSION_CAT(NETPGP_BASE_VERSION, NETPGP_AUTOCONF_VERSION) 65 NETPGP_VERSION_CAT(NETPGP_BASE_VERSION, NETPGP_AUTOCONF_VERSION)
66 66
67#endif /* !VERSION_H_ */ 67#endif /* !VERSION_H_ */
cvs diff -r1.16 -r1.17 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile 2010/07/09 05:36:28 1.16
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile 2010/08/07 04:16:40 1.17
@@ -107,36 +107,36 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c @@ -107,36 +107,36 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c
107LDFLAGS =  107LDFLAGS =
108LIBOBJS =  108LIBOBJS =
109LIBS = -lcrypto -lbz2 -lz  109LIBS = -lcrypto -lbz2 -lz
110LIBTOOL = $(SHELL) $(top_builddir)/libtool 110LIBTOOL = $(SHELL) $(top_builddir)/libtool
111LN_S = ln -s 111LN_S = ln -s
112LTLIBOBJS =  112LTLIBOBJS =
113MAINT = # 113MAINT = #
114MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo 114MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo
115MKDIR_P = ../../buildaux/install-sh -c -d 115MKDIR_P = ../../buildaux/install-sh -c -d
116OBJEXT = o 116OBJEXT = o
117PACKAGE = netpgp 117PACKAGE = netpgp
118PACKAGE_BUGREPORT = Alistair Crooks <agc@netbsd.org> c0596823 118PACKAGE_BUGREPORT = Alistair Crooks <agc@netbsd.org> c0596823
119PACKAGE_NAME = netpgp 119PACKAGE_NAME = netpgp
120PACKAGE_STRING = netpgp 20100707 120PACKAGE_STRING = netpgp 20100708
121PACKAGE_TARNAME = netpgp 121PACKAGE_TARNAME = netpgp
122PACKAGE_VERSION = 20100707 122PACKAGE_VERSION = 20100708
123PATH_SEPARATOR = : 123PATH_SEPARATOR = :
124RANLIB = ranlib 124RANLIB = ranlib
125SED = /usr/bin/sed 125SED = /usr/bin/sed
126SET_MAKE =  126SET_MAKE =
127SHELL = /bin/ksh 127SHELL = /bin/ksh
128STRIP = strip 128STRIP = strip
129VERSION = 20100707 129VERSION = 20100708
130WARNCFLAGS = -Werror -Wall -Wpointer-arith 130WARNCFLAGS = -Werror -Wall -Wpointer-arith
131abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp 131abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
132abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp 132abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
133abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist 133abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist
134abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist 134abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist
135ac_ct_CC = gcc 135ac_ct_CC = gcc
136ac_ct_CXX = g++ 136ac_ct_CXX = g++
137ac_ct_F77 =  137ac_ct_F77 =
138am__include = include 138am__include = include
139am__leading_dot = . 139am__leading_dot = .
140am__quote =  140am__quote =
141am__tar = ${AMTAR} chof - "$$tardir" 141am__tar = ${AMTAR} chof - "$$tardir"
142am__untar = ${AMTAR} xf - 142am__untar = ${AMTAR} xf -
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in 2009/06/10 00:38:09 1.2
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in 2010/08/07 04:16:40 1.3
@@ -27,27 +27,28 @@ transform = $(program_transform_name) @@ -27,27 +27,28 @@ transform = $(program_transform_name)
27NORMAL_INSTALL = : 27NORMAL_INSTALL = :
28PRE_INSTALL = : 28PRE_INSTALL = :
29POST_INSTALL = : 29POST_INSTALL = :
30NORMAL_UNINSTALL = : 30NORMAL_UNINSTALL = :
31PRE_UNINSTALL = : 31PRE_UNINSTALL = :
32POST_UNINSTALL = : 32POST_UNINSTALL = :
33build_triplet = @build@ 33build_triplet = @build@
34host_triplet = @host@ 34host_triplet = @host@
35bin_PROGRAMS = netpgp$(EXEEXT) 35bin_PROGRAMS = netpgp$(EXEEXT)
36subdir = src/netpgp 36subdir = src/netpgp
37DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ 37DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
38 $(srcdir)/Makefile.in 38 $(srcdir)/Makefile.in
39ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 39ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40am__aclocal_m4_deps = $(top_srcdir)/configure.ac 40am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
 41 $(top_srcdir)/configure.ac
41am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 42am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42 $(ACLOCAL_M4) 43 $(ACLOCAL_M4)
43mkinstalldirs = $(install_sh) -d 44mkinstalldirs = $(install_sh) -d
44CONFIG_HEADER = $(top_builddir)/src/lib/config.h 45CONFIG_HEADER = $(top_builddir)/src/lib/config.h
45CONFIG_CLEAN_FILES = 46CONFIG_CLEAN_FILES =
46am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 47am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
47binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 48binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
48PROGRAMS = $(bin_PROGRAMS) 49PROGRAMS = $(bin_PROGRAMS)
49am_netpgp_OBJECTS = netpgp-netpgp.$(OBJEXT) 50am_netpgp_OBJECTS = netpgp-netpgp.$(OBJEXT)
50netpgp_OBJECTS = $(am_netpgp_OBJECTS) 51netpgp_OBJECTS = $(am_netpgp_OBJECTS)
51netpgp_DEPENDENCIES = ../lib/libnetpgp.la 52netpgp_DEPENDENCIES = ../lib/libnetpgp.la
52DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib 53DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib
53depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp 54depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
@@ -73,78 +74,84 @@ ACLOCAL = @ACLOCAL@ @@ -73,78 +74,84 @@ ACLOCAL = @ACLOCAL@
73AMTAR = @AMTAR@ 74AMTAR = @AMTAR@
74AR = @AR@ 75AR = @AR@
75AUTOCONF = @AUTOCONF@ 76AUTOCONF = @AUTOCONF@
76AUTOHEADER = @AUTOHEADER@ 77AUTOHEADER = @AUTOHEADER@
77AUTOM4TE = @AUTOM4TE@ 78AUTOM4TE = @AUTOM4TE@
78AUTOMAKE = @AUTOMAKE@ 79AUTOMAKE = @AUTOMAKE@
79AWK = @AWK@ 80AWK = @AWK@
80CANONICAL_HOST = @CANONICAL_HOST@ 81CANONICAL_HOST = @CANONICAL_HOST@
81CC = @CC@ 82CC = @CC@
82CCDEPMODE = @CCDEPMODE@ 83CCDEPMODE = @CCDEPMODE@
83CFLAGS = @CFLAGS@ 84CFLAGS = @CFLAGS@
84CPP = @CPP@ 85CPP = @CPP@
85CPPFLAGS = @CPPFLAGS@ 86CPPFLAGS = @CPPFLAGS@
86CXX = @CXX@ 
87CXXCPP = @CXXCPP@ 
88CXXDEPMODE = @CXXDEPMODE@ 
89CXXFLAGS = @CXXFLAGS@ 
90CYGPATH_W = @CYGPATH_W@ 87CYGPATH_W = @CYGPATH_W@
91DEFS = @DEFS@ 88DEFS = @DEFS@
92DEPDIR = @DEPDIR@ 89DEPDIR = @DEPDIR@
93ECHO = @ECHO@ 90DSYMUTIL = @DSYMUTIL@
 91DUMPBIN = @DUMPBIN@
94ECHO_C = @ECHO_C@ 92ECHO_C = @ECHO_C@
95ECHO_N = @ECHO_N@ 93ECHO_N = @ECHO_N@
96ECHO_T = @ECHO_T@ 94ECHO_T = @ECHO_T@
97EGREP = @EGREP@ 95EGREP = @EGREP@
98EXEEXT = @EXEEXT@ 96EXEEXT = @EXEEXT@
99F77 = @F77@ 97FGREP = @FGREP@
100FFLAGS = @FFLAGS@ 
101GREP = @GREP@ 98GREP = @GREP@
102INSTALL = @INSTALL@ 99INSTALL = @INSTALL@
103INSTALL_DATA = @INSTALL_DATA@ 100INSTALL_DATA = @INSTALL_DATA@
104INSTALL_PROGRAM = @INSTALL_PROGRAM@ 101INSTALL_PROGRAM = @INSTALL_PROGRAM@
105INSTALL_SCRIPT = @INSTALL_SCRIPT@ 102INSTALL_SCRIPT = @INSTALL_SCRIPT@
106INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 103INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 104LD = @LD@
107LDFLAGS = @LDFLAGS@ 105LDFLAGS = @LDFLAGS@
108LIBOBJS = @LIBOBJS@ 106LIBOBJS = @LIBOBJS@
109LIBS = @LIBS@ 107LIBS = @LIBS@
110LIBTOOL = @LIBTOOL@ 108LIBTOOL = @LIBTOOL@
 109LIPO = @LIPO@
111LN_S = @LN_S@ 110LN_S = @LN_S@
112LTLIBOBJS = @LTLIBOBJS@ 111LTLIBOBJS = @LTLIBOBJS@
113MAINT = @MAINT@ 112MAINT = @MAINT@
114MAKEINFO = @MAKEINFO@ 113MAKEINFO = @MAKEINFO@
115MKDIR_P = @MKDIR_P@ 114MKDIR_P = @MKDIR_P@
 115NM = @NM@
 116NMEDIT = @NMEDIT@
 117OBJDUMP = @OBJDUMP@
116OBJEXT = @OBJEXT@ 118OBJEXT = @OBJEXT@
 119OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 120OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 121OPENSSL_LIBS = @OPENSSL_LIBS@
 122OTOOL = @OTOOL@
 123OTOOL64 = @OTOOL64@
117PACKAGE = @PACKAGE@ 124PACKAGE = @PACKAGE@
118PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 125PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
119PACKAGE_NAME = @PACKAGE_NAME@ 126PACKAGE_NAME = @PACKAGE_NAME@
120PACKAGE_STRING = @PACKAGE_STRING@ 127PACKAGE_STRING = @PACKAGE_STRING@
121PACKAGE_TARNAME = @PACKAGE_TARNAME@ 128PACKAGE_TARNAME = @PACKAGE_TARNAME@
122PACKAGE_VERSION = @PACKAGE_VERSION@ 129PACKAGE_VERSION = @PACKAGE_VERSION@
123PATH_SEPARATOR = @PATH_SEPARATOR@ 130PATH_SEPARATOR = @PATH_SEPARATOR@
 131PKG_CONFIG = @PKG_CONFIG@
124RANLIB = @RANLIB@ 132RANLIB = @RANLIB@
125SED = @SED@ 133SED = @SED@
126SET_MAKE = @SET_MAKE@ 134SET_MAKE = @SET_MAKE@
127SHELL = @SHELL@ 135SHELL = @SHELL@
128STRIP = @STRIP@ 136STRIP = @STRIP@
129VERSION = @VERSION@ 137VERSION = @VERSION@
130WARNCFLAGS = @WARNCFLAGS@ 138WARNCFLAGS = @WARNCFLAGS@
131abs_builddir = @abs_builddir@ 139abs_builddir = @abs_builddir@
132abs_srcdir = @abs_srcdir@ 140abs_srcdir = @abs_srcdir@
133abs_top_builddir = @abs_top_builddir@ 141abs_top_builddir = @abs_top_builddir@
134abs_top_srcdir = @abs_top_srcdir@ 142abs_top_srcdir = @abs_top_srcdir@
135ac_ct_CC = @ac_ct_CC@ 143ac_ct_CC = @ac_ct_CC@
136ac_ct_CXX = @ac_ct_CXX@ 144ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
137ac_ct_F77 = @ac_ct_F77@ 
138am__include = @am__include@ 145am__include = @am__include@
139am__leading_dot = @am__leading_dot@ 146am__leading_dot = @am__leading_dot@
140am__quote = @am__quote@ 147am__quote = @am__quote@
141am__tar = @am__tar@ 148am__tar = @am__tar@
142am__untar = @am__untar@ 149am__untar = @am__untar@
143bindir = @bindir@ 150bindir = @bindir@
144build = @build@ 151build = @build@
145build_alias = @build_alias@ 152build_alias = @build_alias@
146build_cpu = @build_cpu@ 153build_cpu = @build_cpu@
147build_os = @build_os@ 154build_os = @build_os@
148build_vendor = @build_vendor@ 155build_vendor = @build_vendor@
149builddir = @builddir@ 156builddir = @builddir@
150datadir = @datadir@ 157datadir = @datadir@
@@ -155,26 +162,27 @@ exec_prefix = @exec_prefix@ @@ -155,26 +162,27 @@ exec_prefix = @exec_prefix@
155host = @host@ 162host = @host@
156host_alias = @host_alias@ 163host_alias = @host_alias@
157host_cpu = @host_cpu@ 164host_cpu = @host_cpu@
158host_os = @host_os@ 165host_os = @host_os@
159host_vendor = @host_vendor@ 166host_vendor = @host_vendor@
160htmldir = @htmldir@ 167htmldir = @htmldir@
161includedir = @includedir@ 168includedir = @includedir@
162infodir = @infodir@ 169infodir = @infodir@
163install_sh = @install_sh@ 170install_sh = @install_sh@
164libdir = @libdir@ 171libdir = @libdir@
165libexecdir = @libexecdir@ 172libexecdir = @libexecdir@
166localedir = @localedir@ 173localedir = @localedir@
167localstatedir = @localstatedir@ 174localstatedir = @localstatedir@
 175lt_ECHO = @lt_ECHO@
168mandir = @mandir@ 176mandir = @mandir@
169mkdir_p = @mkdir_p@ 177mkdir_p = @mkdir_p@
170oldincludedir = @oldincludedir@ 178oldincludedir = @oldincludedir@
171pdfdir = @pdfdir@ 179pdfdir = @pdfdir@
172prefix = @prefix@ 180prefix = @prefix@
173program_transform_name = @program_transform_name@ 181program_transform_name = @program_transform_name@
174psdir = @psdir@ 182psdir = @psdir@
175sbindir = @sbindir@ 183sbindir = @sbindir@
176sharedstatedir = @sharedstatedir@ 184sharedstatedir = @sharedstatedir@
177srcdir = @srcdir@ 185srcdir = @srcdir@
178sysconfdir = @sysconfdir@ 186sysconfdir = @sysconfdir@
179target_alias = @target_alias@ 187target_alias = @target_alias@
180top_build_prefix = @top_build_prefix@ 188top_build_prefix = @top_build_prefix@
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in 2009/06/10 00:38:10 1.1
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in 2010/08/07 04:16:41 1.2
@@ -27,27 +27,28 @@ transform = $(program_transform_name) @@ -27,27 +27,28 @@ transform = $(program_transform_name)
27NORMAL_INSTALL = : 27NORMAL_INSTALL = :
28PRE_INSTALL = : 28PRE_INSTALL = :
29POST_INSTALL = : 29POST_INSTALL = :
30NORMAL_UNINSTALL = : 30NORMAL_UNINSTALL = :
31PRE_UNINSTALL = : 31PRE_UNINSTALL = :
32POST_UNINSTALL = : 32POST_UNINSTALL = :
33build_triplet = @build@ 33build_triplet = @build@
34host_triplet = @host@ 34host_triplet = @host@
35bin_PROGRAMS = netpgpkeys$(EXEEXT) 35bin_PROGRAMS = netpgpkeys$(EXEEXT)
36subdir = src/netpgpkeys 36subdir = src/netpgpkeys
37DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ 37DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
38 $(srcdir)/Makefile.in 38 $(srcdir)/Makefile.in
39ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 39ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40am__aclocal_m4_deps = $(top_srcdir)/configure.ac 40am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
 41 $(top_srcdir)/configure.ac
41am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 42am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42 $(ACLOCAL_M4) 43 $(ACLOCAL_M4)
43mkinstalldirs = $(install_sh) -d 44mkinstalldirs = $(install_sh) -d
44CONFIG_HEADER = $(top_builddir)/src/lib/config.h 45CONFIG_HEADER = $(top_builddir)/src/lib/config.h
45CONFIG_CLEAN_FILES = 46CONFIG_CLEAN_FILES =
46am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 47am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
47binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 48binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
48PROGRAMS = $(bin_PROGRAMS) 49PROGRAMS = $(bin_PROGRAMS)
49am_netpgpkeys_OBJECTS = netpgpkeys-netpgpkeys.$(OBJEXT) 50am_netpgpkeys_OBJECTS = netpgpkeys-netpgpkeys.$(OBJEXT)
50netpgpkeys_OBJECTS = $(am_netpgpkeys_OBJECTS) 51netpgpkeys_OBJECTS = $(am_netpgpkeys_OBJECTS)
51netpgpkeys_DEPENDENCIES = ../lib/libnetpgp.la 52netpgpkeys_DEPENDENCIES = ../lib/libnetpgp.la
52DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib 53DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib
53depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp 54depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
@@ -73,78 +74,84 @@ ACLOCAL = @ACLOCAL@ @@ -73,78 +74,84 @@ ACLOCAL = @ACLOCAL@
73AMTAR = @AMTAR@ 74AMTAR = @AMTAR@
74AR = @AR@ 75AR = @AR@
75AUTOCONF = @AUTOCONF@ 76AUTOCONF = @AUTOCONF@
76AUTOHEADER = @AUTOHEADER@ 77AUTOHEADER = @AUTOHEADER@
77AUTOM4TE = @AUTOM4TE@ 78AUTOM4TE = @AUTOM4TE@
78AUTOMAKE = @AUTOMAKE@ 79AUTOMAKE = @AUTOMAKE@
79AWK = @AWK@ 80AWK = @AWK@
80CANONICAL_HOST = @CANONICAL_HOST@ 81CANONICAL_HOST = @CANONICAL_HOST@
81CC = @CC@ 82CC = @CC@
82CCDEPMODE = @CCDEPMODE@ 83CCDEPMODE = @CCDEPMODE@
83CFLAGS = @CFLAGS@ 84CFLAGS = @CFLAGS@
84CPP = @CPP@ 85CPP = @CPP@
85CPPFLAGS = @CPPFLAGS@ 86CPPFLAGS = @CPPFLAGS@
86CXX = @CXX@ 
87CXXCPP = @CXXCPP@ 
88CXXDEPMODE = @CXXDEPMODE@ 
89CXXFLAGS = @CXXFLAGS@ 
90CYGPATH_W = @CYGPATH_W@ 87CYGPATH_W = @CYGPATH_W@
91DEFS = @DEFS@ 88DEFS = @DEFS@
92DEPDIR = @DEPDIR@ 89DEPDIR = @DEPDIR@
93ECHO = @ECHO@ 90DSYMUTIL = @DSYMUTIL@
 91DUMPBIN = @DUMPBIN@
94ECHO_C = @ECHO_C@ 92ECHO_C = @ECHO_C@
95ECHO_N = @ECHO_N@ 93ECHO_N = @ECHO_N@
96ECHO_T = @ECHO_T@ 94ECHO_T = @ECHO_T@
97EGREP = @EGREP@ 95EGREP = @EGREP@
98EXEEXT = @EXEEXT@ 96EXEEXT = @EXEEXT@
99F77 = @F77@ 97FGREP = @FGREP@
100FFLAGS = @FFLAGS@ 
101GREP = @GREP@ 98GREP = @GREP@
102INSTALL = @INSTALL@ 99INSTALL = @INSTALL@
103INSTALL_DATA = @INSTALL_DATA@ 100INSTALL_DATA = @INSTALL_DATA@
104INSTALL_PROGRAM = @INSTALL_PROGRAM@ 101INSTALL_PROGRAM = @INSTALL_PROGRAM@
105INSTALL_SCRIPT = @INSTALL_SCRIPT@ 102INSTALL_SCRIPT = @INSTALL_SCRIPT@
106INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 103INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 104LD = @LD@
107LDFLAGS = @LDFLAGS@ 105LDFLAGS = @LDFLAGS@
108LIBOBJS = @LIBOBJS@ 106LIBOBJS = @LIBOBJS@
109LIBS = @LIBS@ 107LIBS = @LIBS@
110LIBTOOL = @LIBTOOL@ 108LIBTOOL = @LIBTOOL@
 109LIPO = @LIPO@
111LN_S = @LN_S@ 110LN_S = @LN_S@
112LTLIBOBJS = @LTLIBOBJS@ 111LTLIBOBJS = @LTLIBOBJS@
113MAINT = @MAINT@ 112MAINT = @MAINT@
114MAKEINFO = @MAKEINFO@ 113MAKEINFO = @MAKEINFO@
115MKDIR_P = @MKDIR_P@ 114MKDIR_P = @MKDIR_P@
 115NM = @NM@
 116NMEDIT = @NMEDIT@
 117OBJDUMP = @OBJDUMP@
116OBJEXT = @OBJEXT@ 118OBJEXT = @OBJEXT@
 119OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 120OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 121OPENSSL_LIBS = @OPENSSL_LIBS@
 122OTOOL = @OTOOL@
 123OTOOL64 = @OTOOL64@
117PACKAGE = @PACKAGE@ 124PACKAGE = @PACKAGE@
118PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 125PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
119PACKAGE_NAME = @PACKAGE_NAME@ 126PACKAGE_NAME = @PACKAGE_NAME@
120PACKAGE_STRING = @PACKAGE_STRING@ 127PACKAGE_STRING = @PACKAGE_STRING@
121PACKAGE_TARNAME = @PACKAGE_TARNAME@ 128PACKAGE_TARNAME = @PACKAGE_TARNAME@
122PACKAGE_VERSION = @PACKAGE_VERSION@ 129PACKAGE_VERSION = @PACKAGE_VERSION@
123PATH_SEPARATOR = @PATH_SEPARATOR@ 130PATH_SEPARATOR = @PATH_SEPARATOR@
 131PKG_CONFIG = @PKG_CONFIG@
124RANLIB = @RANLIB@ 132RANLIB = @RANLIB@
125SED = @SED@ 133SED = @SED@
126SET_MAKE = @SET_MAKE@ 134SET_MAKE = @SET_MAKE@
127SHELL = @SHELL@ 135SHELL = @SHELL@
128STRIP = @STRIP@ 136STRIP = @STRIP@
129VERSION = @VERSION@ 137VERSION = @VERSION@
130WARNCFLAGS = @WARNCFLAGS@ 138WARNCFLAGS = @WARNCFLAGS@
131abs_builddir = @abs_builddir@ 139abs_builddir = @abs_builddir@
132abs_srcdir = @abs_srcdir@ 140abs_srcdir = @abs_srcdir@
133abs_top_builddir = @abs_top_builddir@ 141abs_top_builddir = @abs_top_builddir@
134abs_top_srcdir = @abs_top_srcdir@ 142abs_top_srcdir = @abs_top_srcdir@
135ac_ct_CC = @ac_ct_CC@ 143ac_ct_CC = @ac_ct_CC@
136ac_ct_CXX = @ac_ct_CXX@ 144ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
137ac_ct_F77 = @ac_ct_F77@ 
138am__include = @am__include@ 145am__include = @am__include@
139am__leading_dot = @am__leading_dot@ 146am__leading_dot = @am__leading_dot@
140am__quote = @am__quote@ 147am__quote = @am__quote@
141am__tar = @am__tar@ 148am__tar = @am__tar@
142am__untar = @am__untar@ 149am__untar = @am__untar@
143bindir = @bindir@ 150bindir = @bindir@
144build = @build@ 151build = @build@
145build_alias = @build_alias@ 152build_alias = @build_alias@
146build_cpu = @build_cpu@ 153build_cpu = @build_cpu@
147build_os = @build_os@ 154build_os = @build_os@
148build_vendor = @build_vendor@ 155build_vendor = @build_vendor@
149builddir = @builddir@ 156builddir = @builddir@
150datadir = @datadir@ 157datadir = @datadir@
@@ -155,26 +162,27 @@ exec_prefix = @exec_prefix@ @@ -155,26 +162,27 @@ exec_prefix = @exec_prefix@
155host = @host@ 162host = @host@
156host_alias = @host_alias@ 163host_alias = @host_alias@
157host_cpu = @host_cpu@ 164host_cpu = @host_cpu@
158host_os = @host_os@ 165host_os = @host_os@
159host_vendor = @host_vendor@ 166host_vendor = @host_vendor@
160htmldir = @htmldir@ 167htmldir = @htmldir@
161includedir = @includedir@ 168includedir = @includedir@
162infodir = @infodir@ 169infodir = @infodir@
163install_sh = @install_sh@ 170install_sh = @install_sh@
164libdir = @libdir@ 171libdir = @libdir@
165libexecdir = @libexecdir@ 172libexecdir = @libexecdir@
166localedir = @localedir@ 173localedir = @localedir@
167localstatedir = @localstatedir@ 174localstatedir = @localstatedir@
 175lt_ECHO = @lt_ECHO@
168mandir = @mandir@ 176mandir = @mandir@
169mkdir_p = @mkdir_p@ 177mkdir_p = @mkdir_p@
170oldincludedir = @oldincludedir@ 178oldincludedir = @oldincludedir@
171pdfdir = @pdfdir@ 179pdfdir = @pdfdir@
172prefix = @prefix@ 180prefix = @prefix@
173program_transform_name = @program_transform_name@ 181program_transform_name = @program_transform_name@
174psdir = @psdir@ 182psdir = @psdir@
175sbindir = @sbindir@ 183sbindir = @sbindir@
176sharedstatedir = @sharedstatedir@ 184sharedstatedir = @sharedstatedir@
177srcdir = @srcdir@ 185srcdir = @srcdir@
178sysconfdir = @sysconfdir@ 186sysconfdir = @sysconfdir@
179target_alias = @target_alias@ 187target_alias = @target_alias@
180top_build_prefix = @top_build_prefix@ 188top_build_prefix = @top_build_prefix@
cvs diff -r1.14 -r1.15 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c 2010/07/01 04:27:21 1.14
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c 2010/08/07 04:16:41 1.15
@@ -23,31 +23,33 @@ @@ -23,31 +23,33 @@
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30/* Command line program to perform netpgp operations */ 30/* Command line program to perform netpgp operations */
31#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/stat.h> 33#include <sys/stat.h>
34 34
35#include <getopt.h> 35#include <getopt.h>
 36#include <stdarg.h>
36#include <stdio.h> 37#include <stdio.h>
37#include <stdlib.h> 38#include <stdlib.h>
38#include <string.h> 39#include <string.h>
39#include <unistd.h> 40#include <unistd.h>
40 41
 42#include <mj.h>
41#include <netpgp.h> 43#include <netpgp.h>
42 44
43/* 45/*
44 * 2048 is the absolute minimum, really - we should really look at 46 * 2048 is the absolute minimum, really - we should really look at
45 * bumping this to 4096 or even higher - agc, 20090522 47 * bumping this to 4096 or even higher - agc, 20090522
46 */ 48 */
47#define DEFAULT_NUMBITS 2048 49#define DEFAULT_NUMBITS 2048
48 50
49#define DEFAULT_HASH_ALG "SHA256" 51#define DEFAULT_HASH_ALG "SHA256"
50 52
51static const char *usage = 53static const char *usage =
52 " --help OR\n" 54 " --help OR\n"
53 "\t--export-keys [options] OR\n" 55 "\t--export-keys [options] OR\n"
@@ -146,37 +148,220 @@ typedef struct prog_t { @@ -146,37 +148,220 @@ typedef struct prog_t {
146 148
147/* print a usage message */ 149/* print a usage message */
148static void 150static void
149print_usage(const char *usagemsg, char *progname) 151print_usage(const char *usagemsg, char *progname)
150{ 152{
151 (void) fprintf(stderr, 153 (void) fprintf(stderr,
152 "%s\nAll bug reports, praise and chocolate, please, to:\n%s\n", 154 "%s\nAll bug reports, praise and chocolate, please, to:\n%s\n",
153 netpgp_get_info("version"), 155 netpgp_get_info("version"),
154 netpgp_get_info("maintainer")); 156 netpgp_get_info("maintainer"));
155 (void) fprintf(stderr, "Usage: %s COMMAND OPTIONS:\n%s %s", 157 (void) fprintf(stderr, "Usage: %s COMMAND OPTIONS:\n%s %s",
156 progname, progname, usagemsg); 158 progname, progname, usagemsg);
157} 159}
158 160
 161/* vararg print function */
 162static void
 163p(FILE *fp, char *s, ...)
 164{
 165 va_list args;
 166
 167 va_start(args, s);
 168 while (s != NULL) {
 169 (void) fprintf(fp, "%s", s);
 170 s = va_arg(args, char *);
 171 }
 172 va_end(args);
 173}
 174
 175/* print a JSON object to the FILE stream */
 176static void
 177pobj(FILE *fp, mj_t *obj, int depth)
 178{
 179 int i;
 180
 181 for (i = 0 ; i < depth ; i++) {
 182 p(fp, " ", NULL);
 183 }
 184 switch(obj->type) {
 185 case MJ_NULL:
 186 case MJ_FALSE:
 187 case MJ_TRUE:
 188 p(fp, (obj->type == MJ_NULL) ? "null" : (obj->type == MJ_FALSE) ? "false" : "true", NULL);
 189 break;
 190 case MJ_NUMBER:
 191 p(fp, obj->value.s, NULL);
 192 break;
 193 case MJ_STRING:
 194 (void) fprintf(fp, "%.*s", (int)(obj->c), obj->value.s);
 195 break;
 196 case MJ_ARRAY:
 197 for (i = 0 ; i < obj->c ; i++) {
 198 pobj(fp, &obj->value.v[i], depth + 1);
 199 if (i < obj->c - 1) {
 200 (void) fprintf(fp, ", ");
 201 }
 202 }
 203 (void) fprintf(fp, "\n");
 204 break;
 205 case MJ_OBJECT:
 206 for (i = 0 ; i < obj->c ; i += 2) {
 207 pobj(fp, &obj->value.v[i], depth + 1);
 208 p(fp, ": ", NULL);
 209 pobj(fp, &obj->value.v[i + 1], 0);
 210 if (i < obj->c - 1) {
 211 p(fp, ", ", NULL);
 212 }
 213 }
 214 p(fp, "\n", NULL);
 215 break;
 216 default:
 217 break;
 218 }
 219}
 220
 221/* return the time as a string */
 222static char *
 223ptimestr(char *dest, size_t size, time_t t)
 224{
 225 struct tm *tm;
 226
 227 tm = gmtime(&t);
 228 (void) snprintf(dest, size, "%04d-%02d-%02d",
 229 tm->tm_year + 1900,
 230 tm->tm_mon + 1,
 231 tm->tm_mday);
 232 return dest;
 233}
 234
 235/* format a JSON object */
 236static void
 237formatobj(FILE *fp, mj_t *obj, const int psigs)
 238{
 239 int64_t birthtime;
 240 int64_t duration;
 241 time_t now;
 242 char tbuf[32];
 243 char *s;
 244 mj_t *sub;
 245 int r;
 246 int i;
 247
 248 if (__ops_get_debug_level(__FILE__)) {
 249 mj_asprint(&s, obj);
 250 (void) fprintf(stderr, "formatobj: json is '%s'\n", s);
 251 free(s);
 252 }
 253 pobj(fp, &obj->value.v[mj_object_find(obj, "header", 0, 2) + 1], 0);
 254 p(fp, " ", NULL);
 255 pobj(fp, &obj->value.v[mj_object_find(obj, "key bits", 0, 2) + 1], 0);
 256 p(fp, "/", NULL);
 257 pobj(fp, &obj->value.v[mj_object_find(obj, "pka", 0, 2) + 1], 0);
 258 p(fp, " ", NULL);
 259 pobj(fp, &obj->value.v[mj_object_find(obj, "key id", 0, 2) + 1], 0);
 260 birthtime = strtoll(obj->value.v[mj_object_find(obj, "birthtime", 0, 2) + 1].value.s, NULL, 10);
 261 p(fp, " ", ptimestr(tbuf, sizeof(tbuf), birthtime), NULL);
 262 duration = strtoll(obj->value.v[mj_object_find(obj, "duration", 0, 2) + 1].value.s, NULL, 10);
 263 if (duration > 0) {
 264 now = time(NULL);
 265 p(fp, " ", (birthtime + duration < now) ? "[EXPIRED " : "[EXPIRES ",
 266 ptimestr(tbuf, sizeof(tbuf), birthtime + duration), "]", NULL);
 267 }
 268 p(fp, "\n", "Key fingerprint: ", NULL);
 269 pobj(fp, &obj->value.v[mj_object_find(obj, "fingerprint", 0, 2) + 1], 0);
 270 p(fp, "\n", NULL);
 271 /* go to field after \"duration\" */
 272 for (i = mj_object_find(obj, "duration", 0, 2) + 2; i < mj_arraycount(obj) ; i += 2) {
 273 if (strcmp(obj->value.v[i].value.s, "uid") == 0) {
 274 sub = &obj->value.v[i + 1];
 275 p(fp, "uid", NULL);
 276 pobj(fp, &sub->value.v[0], (psigs) ? 4 : 14); /* human name */
 277 pobj(fp, &sub->value.v[1], 1); /* any revocation */
 278 p(fp, "\n", NULL);
 279 } else if (strcmp(obj->value.v[i].value.s, "sub") == 0) {
 280 sub = &obj->value.v[i + 1];
 281 p(fp, "sub", NULL);
 282 pobj(fp, &sub->value.v[0], 1); /* size */
 283 p(fp, "/", NULL);
 284 pobj(fp, &sub->value.v[1], 0); /* alg */
 285 p(fp, " ", NULL);
 286 pobj(fp, &sub->value.v[2], 0); /* id */
 287 p(fp, " ", ptimestr(tbuf, sizeof(tbuf), strtoll(sub->value.v[3].value.s, NULL, 10)),
 288 "\n", NULL);
 289 } else if (strcmp(obj->value.v[i].value.s, "sig") == 0) {
 290 sub = &obj->value.v[i + 1];
 291 p(fp, "sig", NULL);
 292 pobj(fp, &sub->value.v[0], 8); /* size */
 293 p(fp, " ", ptimestr(tbuf, sizeof(tbuf), strtoll(sub->value.v[1].value.s, NULL, 10)),
 294 " ", NULL); /* time */
 295 pobj(fp, &sub->value.v[2], 0); /* human name */
 296 p(fp, "\n", NULL);
 297 } else {
 298 fprintf(stderr, "weird '%s'\n", obj->value.v[i].value.s);
 299 pobj(fp, &obj->value.v[i], 0); /* human name */
 300 }
 301 }
 302 p(fp, "\n", NULL);
 303}
 304
 305/* match keys, decoding from json if we do find any */
 306static int
 307match_keys(netpgp_t *netpgp, FILE *fp, char *f, const int psigs)
 308{
 309 char *json;
 310 mj_t ids;
 311 int from;
 312 int idc;
 313 int tok;
 314 int to;
 315 int i;
 316
 317 if (f == NULL) {
 318 if (!netpgp_list_keys_json(netpgp, &json, psigs)) {
 319 return 0;
 320 }
 321 } else {
 322 if (netpgp_match_keys_json(netpgp, &json, f, "human", psigs) == 0) {
 323 return 0;
 324 }
 325 }
 326 if (__ops_get_debug_level(__FILE__)) {
 327 (void) fprintf(stderr, "match_keys: json is '%s'\n", json);
 328 }
 329 /* ids is an array of strings, each containing 1 entry */
 330 (void) memset(&ids, 0x0, sizeof(ids));
 331 from = to = tok = 0;
 332 /* convert from string into an mj structure */
 333 (void) mj_parse(&ids, json, &from, &to, &tok);
 334 idc = mj_arraycount(&ids);
 335 (void) fprintf(fp, "%d key%s found\n", idc, (idc == 1) ? "" : "s");
 336 for (i = 0 ; i < idc ; i++) {
 337 formatobj(fp, &ids.value.v[i], psigs);
 338 }
 339 /* clean up */
 340 free(json);
 341 mj_delete(&ids);
 342 return idc;
 343}
 344
159/* do a command once for a specified file 'f' */ 345/* do a command once for a specified file 'f' */
160static int 346static int
161netpgp_cmd(netpgp_t *netpgp, prog_t *p, char *f) 347netpgp_cmd(netpgp_t *netpgp, prog_t *p, char *f)
162{ 348{
163 char *key; 349 char *key;
164 350
165 switch (p->cmd) { 351 switch (p->cmd) {
166 case LIST_KEYS: 352 case LIST_KEYS:
167 return (f == NULL) ? netpgp_list_keys(netpgp, 0) : netpgp_match_keys(netpgp, f, "human", stdout, 0); 
168 case LIST_SIGS: 353 case LIST_SIGS:
169 return (f == NULL) ? netpgp_list_keys(netpgp, 1) : netpgp_match_keys(netpgp, f, "human", stdout, 1); 354 return match_keys(netpgp, stdout, f, (p->cmd == LIST_SIGS));
170 case FIND_KEY: 355 case FIND_KEY:
171 return netpgp_find_key(netpgp, netpgp_getvar(netpgp, "userid")); 356 return netpgp_find_key(netpgp, netpgp_getvar(netpgp, "userid"));
172 case EXPORT_KEY: 357 case EXPORT_KEY:
173 key = netpgp_export_key(netpgp, netpgp_getvar(netpgp, "userid")); 358 key = netpgp_export_key(netpgp, netpgp_getvar(netpgp, "userid"));
174 if (key) { 359 if (key) {
175 printf("%s", key); 360 printf("%s", key);
176 return 1; 361 return 1;
177 } 362 }
178 (void) fprintf(stderr, "key '%s' not found\n", f); 363 (void) fprintf(stderr, "key '%s' not found\n", f);
179 return 0; 364 return 0;
180 case IMPORT_KEY: 365 case IMPORT_KEY:
181 return netpgp_import_key(netpgp, f); 366 return netpgp_import_key(netpgp, f);
182 case GENERATE_KEY: 367 case GENERATE_KEY:
cvs diff -r1.15 -r1.16 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile 2010/07/09 05:36:29 1.15
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile 2010/08/07 04:16:41 1.16
@@ -108,36 +108,36 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c @@ -108,36 +108,36 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c
108LDFLAGS =  108LDFLAGS =
109LIBOBJS =  109LIBOBJS =
110LIBS = -lcrypto -lbz2 -lz  110LIBS = -lcrypto -lbz2 -lz
111LIBTOOL = $(SHELL) $(top_builddir)/libtool 111LIBTOOL = $(SHELL) $(top_builddir)/libtool
112LN_S = ln -s 112LN_S = ln -s
113LTLIBOBJS =  113LTLIBOBJS =
114MAINT = # 114MAINT = #
115MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo 115MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo
116MKDIR_P = ../../buildaux/install-sh -c -d 116MKDIR_P = ../../buildaux/install-sh -c -d
117OBJEXT = o 117OBJEXT = o
118PACKAGE = netpgp 118PACKAGE = netpgp
119PACKAGE_BUGREPORT = Alistair Crooks <agc@netbsd.org> c0596823 119PACKAGE_BUGREPORT = Alistair Crooks <agc@netbsd.org> c0596823
120PACKAGE_NAME = netpgp 120PACKAGE_NAME = netpgp
121PACKAGE_STRING = netpgp 20100707 121PACKAGE_STRING = netpgp 20100708
122PACKAGE_TARNAME = netpgp 122PACKAGE_TARNAME = netpgp
123PACKAGE_VERSION = 20100707 123PACKAGE_VERSION = 20100708
124PATH_SEPARATOR = : 124PATH_SEPARATOR = :
125RANLIB = ranlib 125RANLIB = ranlib
126SED = /usr/bin/sed 126SED = /usr/bin/sed
127SET_MAKE =  127SET_MAKE =
128SHELL = /bin/ksh 128SHELL = /bin/ksh
129STRIP = strip 129STRIP = strip
130VERSION = 20100707 130VERSION = 20100708
131WARNCFLAGS = -Werror -Wall -Wpointer-arith 131WARNCFLAGS = -Werror -Wall -Wpointer-arith
132abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify 132abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
133abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify 133abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
134abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist 134abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist
135abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist 135abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist
136ac_ct_CC = gcc 136ac_ct_CC = gcc
137ac_ct_CXX = g++ 137ac_ct_CXX = g++
138ac_ct_F77 =  138ac_ct_F77 =
139am__include = include 139am__include = include
140am__leading_dot = . 140am__leading_dot = .
141am__quote =  141am__quote =
142am__tar = ${AMTAR} chof - "$$tardir" 142am__tar = ${AMTAR} chof - "$$tardir"
143am__untar = ${AMTAR} xf - 143am__untar = ${AMTAR} xf -
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in 2010/05/31 06:09:41 1.3
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in 2010/08/07 04:16:41 1.4
@@ -27,39 +27,39 @@ transform = $(program_transform_name) @@ -27,39 +27,39 @@ transform = $(program_transform_name)
27NORMAL_INSTALL = : 27NORMAL_INSTALL = :
28PRE_INSTALL = : 28PRE_INSTALL = :
29POST_INSTALL = : 29POST_INSTALL = :
30NORMAL_UNINSTALL = : 30NORMAL_UNINSTALL = :
31PRE_UNINSTALL = : 31PRE_UNINSTALL = :
32POST_UNINSTALL = : 32POST_UNINSTALL = :
33build_triplet = @build@ 33build_triplet = @build@
34host_triplet = @host@ 34host_triplet = @host@
35bin_PROGRAMS = netpgpverify$(EXEEXT) 35bin_PROGRAMS = netpgpverify$(EXEEXT)
36subdir = src/netpgpverify 36subdir = src/netpgpverify
37DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ 37DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
38 $(srcdir)/Makefile.in 38 $(srcdir)/Makefile.in
39ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 39ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40am__aclocal_m4_deps = $(top_srcdir)/configure.ac 40am__aclocal_m4_deps = $(top_srcdir)/ax_check_openssl.m4 \
 41 $(top_srcdir)/configure.ac
41am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 42am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42 $(ACLOCAL_M4) 43 $(ACLOCAL_M4)
43mkinstalldirs = $(install_sh) -d 44mkinstalldirs = $(install_sh) -d
44CONFIG_HEADER = $(top_builddir)/src/lib/config.h 45CONFIG_HEADER = $(top_builddir)/src/lib/config.h
45CONFIG_CLEAN_FILES = 46CONFIG_CLEAN_FILES =
46am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 47am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
47binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 48binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
48PROGRAMS = $(bin_PROGRAMS) 49PROGRAMS = $(bin_PROGRAMS)
49am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT) 50am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
50netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS) 51netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
51netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la 52netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la
52netpgpverify_LDADD = ../lib/libnetpgp.la 
53DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib 53DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/lib
54depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp 54depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
55am__depfiles_maybe = depfiles 55am__depfiles_maybe = depfiles
56COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 56COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
57 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 57 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
58LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 58LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
59 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 59 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
60 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 60 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
61CCLD = $(CC) 61CCLD = $(CC)
62LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 62LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
63 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 63 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
64 $(LDFLAGS) -o $@ 64 $(LDFLAGS) -o $@
65SOURCES = $(netpgpverify_SOURCES) 65SOURCES = $(netpgpverify_SOURCES)
@@ -74,78 +74,84 @@ ACLOCAL = @ACLOCAL@ @@ -74,78 +74,84 @@ ACLOCAL = @ACLOCAL@
74AMTAR = @AMTAR@ 74AMTAR = @AMTAR@
75AR = @AR@ 75AR = @AR@
76AUTOCONF = @AUTOCONF@ 76AUTOCONF = @AUTOCONF@
77AUTOHEADER = @AUTOHEADER@ 77AUTOHEADER = @AUTOHEADER@
78AUTOM4TE = @AUTOM4TE@ 78AUTOM4TE = @AUTOM4TE@
79AUTOMAKE = @AUTOMAKE@ 79AUTOMAKE = @AUTOMAKE@
80AWK = @AWK@ 80AWK = @AWK@
81CANONICAL_HOST = @CANONICAL_HOST@ 81CANONICAL_HOST = @CANONICAL_HOST@
82CC = @CC@ 82CC = @CC@
83CCDEPMODE = @CCDEPMODE@ 83CCDEPMODE = @CCDEPMODE@
84CFLAGS = @CFLAGS@ 84CFLAGS = @CFLAGS@
85CPP = @CPP@ 85CPP = @CPP@
86CPPFLAGS = @CPPFLAGS@ 86CPPFLAGS = @CPPFLAGS@
87CXX = @CXX@ 
88CXXCPP = @CXXCPP@ 
89CXXDEPMODE = @CXXDEPMODE@ 
90CXXFLAGS = @CXXFLAGS@ 
91CYGPATH_W = @CYGPATH_W@ 87CYGPATH_W = @CYGPATH_W@
92DEFS = @DEFS@ 88DEFS = @DEFS@
93DEPDIR = @DEPDIR@ 89DEPDIR = @DEPDIR@
94ECHO = @ECHO@ 90DSYMUTIL = @DSYMUTIL@
 91DUMPBIN = @DUMPBIN@
95ECHO_C = @ECHO_C@ 92ECHO_C = @ECHO_C@
96ECHO_N = @ECHO_N@ 93ECHO_N = @ECHO_N@
97ECHO_T = @ECHO_T@ 94ECHO_T = @ECHO_T@
98EGREP = @EGREP@ 95EGREP = @EGREP@
99EXEEXT = @EXEEXT@ 96EXEEXT = @EXEEXT@
100F77 = @F77@ 97FGREP = @FGREP@
101FFLAGS = @FFLAGS@ 
102GREP = @GREP@ 98GREP = @GREP@
103INSTALL = @INSTALL@ 99INSTALL = @INSTALL@
104INSTALL_DATA = @INSTALL_DATA@ 100INSTALL_DATA = @INSTALL_DATA@
105INSTALL_PROGRAM = @INSTALL_PROGRAM@ 101INSTALL_PROGRAM = @INSTALL_PROGRAM@
106INSTALL_SCRIPT = @INSTALL_SCRIPT@ 102INSTALL_SCRIPT = @INSTALL_SCRIPT@
107INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 103INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 104LD = @LD@
108LDFLAGS = @LDFLAGS@ 105LDFLAGS = @LDFLAGS@
109LIBOBJS = @LIBOBJS@ 106LIBOBJS = @LIBOBJS@
110LIBS = @LIBS@ 107LIBS = @LIBS@
111LIBTOOL = @LIBTOOL@ 108LIBTOOL = @LIBTOOL@
 109LIPO = @LIPO@
112LN_S = @LN_S@ 110LN_S = @LN_S@
113LTLIBOBJS = @LTLIBOBJS@ 111LTLIBOBJS = @LTLIBOBJS@
114MAINT = @MAINT@ 112MAINT = @MAINT@
115MAKEINFO = @MAKEINFO@ 113MAKEINFO = @MAKEINFO@
116MKDIR_P = @MKDIR_P@ 114MKDIR_P = @MKDIR_P@
 115NM = @NM@
 116NMEDIT = @NMEDIT@
 117OBJDUMP = @OBJDUMP@
117OBJEXT = @OBJEXT@ 118OBJEXT = @OBJEXT@
 119OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 120OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 121OPENSSL_LIBS = @OPENSSL_LIBS@
 122OTOOL = @OTOOL@
 123OTOOL64 = @OTOOL64@
118PACKAGE = @PACKAGE@ 124PACKAGE = @PACKAGE@
119PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 125PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
120PACKAGE_NAME = @PACKAGE_NAME@ 126PACKAGE_NAME = @PACKAGE_NAME@
121PACKAGE_STRING = @PACKAGE_STRING@ 127PACKAGE_STRING = @PACKAGE_STRING@
122PACKAGE_TARNAME = @PACKAGE_TARNAME@ 128PACKAGE_TARNAME = @PACKAGE_TARNAME@
123PACKAGE_VERSION = @PACKAGE_VERSION@ 129PACKAGE_VERSION = @PACKAGE_VERSION@
124PATH_SEPARATOR = @PATH_SEPARATOR@ 130PATH_SEPARATOR = @PATH_SEPARATOR@
 131PKG_CONFIG = @PKG_CONFIG@
125RANLIB = @RANLIB@ 132RANLIB = @RANLIB@
126SED = @SED@ 133SED = @SED@
127SET_MAKE = @SET_MAKE@ 134SET_MAKE = @SET_MAKE@
128SHELL = @SHELL@ 135SHELL = @SHELL@
129STRIP = @STRIP@ 136STRIP = @STRIP@
130VERSION = @VERSION@ 137VERSION = @VERSION@
131WARNCFLAGS = @WARNCFLAGS@ 138WARNCFLAGS = @WARNCFLAGS@
132abs_builddir = @abs_builddir@ 139abs_builddir = @abs_builddir@
133abs_srcdir = @abs_srcdir@ 140abs_srcdir = @abs_srcdir@
134abs_top_builddir = @abs_top_builddir@ 141abs_top_builddir = @abs_top_builddir@
135abs_top_srcdir = @abs_top_srcdir@ 142abs_top_srcdir = @abs_top_srcdir@
136ac_ct_CC = @ac_ct_CC@ 143ac_ct_CC = @ac_ct_CC@
137ac_ct_CXX = @ac_ct_CXX@ 144ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
138ac_ct_F77 = @ac_ct_F77@ 
139am__include = @am__include@ 145am__include = @am__include@
140am__leading_dot = @am__leading_dot@ 146am__leading_dot = @am__leading_dot@
141am__quote = @am__quote@ 147am__quote = @am__quote@
142am__tar = @am__tar@ 148am__tar = @am__tar@
143am__untar = @am__untar@ 149am__untar = @am__untar@
144bindir = @bindir@ 150bindir = @bindir@
145build = @build@ 151build = @build@
146build_alias = @build_alias@ 152build_alias = @build_alias@
147build_cpu = @build_cpu@ 153build_cpu = @build_cpu@
148build_os = @build_os@ 154build_os = @build_os@
149build_vendor = @build_vendor@ 155build_vendor = @build_vendor@
150builddir = @builddir@ 156builddir = @builddir@
151datadir = @datadir@ 157datadir = @datadir@
@@ -156,44 +162,46 @@ exec_prefix = @exec_prefix@ @@ -156,44 +162,46 @@ exec_prefix = @exec_prefix@
156host = @host@ 162host = @host@
157host_alias = @host_alias@ 163host_alias = @host_alias@
158host_cpu = @host_cpu@ 164host_cpu = @host_cpu@
159host_os = @host_os@ 165host_os = @host_os@
160host_vendor = @host_vendor@ 166host_vendor = @host_vendor@
161htmldir = @htmldir@ 167htmldir = @htmldir@
162includedir = @includedir@ 168includedir = @includedir@
163infodir = @infodir@ 169infodir = @infodir@
164install_sh = @install_sh@ 170install_sh = @install_sh@
165libdir = @libdir@ 171libdir = @libdir@
166libexecdir = @libexecdir@ 172libexecdir = @libexecdir@
167localedir = @localedir@ 173localedir = @localedir@
168localstatedir = @localstatedir@ 174localstatedir = @localstatedir@
 175lt_ECHO = @lt_ECHO@
169mandir = @mandir@ 176mandir = @mandir@
170mkdir_p = @mkdir_p@ 177mkdir_p = @mkdir_p@
171oldincludedir = @oldincludedir@ 178oldincludedir = @oldincludedir@
172pdfdir = @pdfdir@ 179pdfdir = @pdfdir@
173prefix = @prefix@ 180prefix = @prefix@
174program_transform_name = @program_transform_name@ 181program_transform_name = @program_transform_name@
175psdir = @psdir@ 182psdir = @psdir@
176sbindir = @sbindir@ 183sbindir = @sbindir@
177sharedstatedir = @sharedstatedir@ 184sharedstatedir = @sharedstatedir@
178srcdir = @srcdir@ 185srcdir = @srcdir@
179sysconfdir = @sysconfdir@ 186sysconfdir = @sysconfdir@
180target_alias = @target_alias@ 187target_alias = @target_alias@
181top_build_prefix = @top_build_prefix@ 188top_build_prefix = @top_build_prefix@
182top_builddir = @top_builddir@ 189top_builddir = @top_builddir@
183top_srcdir = @top_srcdir@ 190top_srcdir = @top_srcdir@
184AM_CFLAGS = $(WARNCFLAGS) 191AM_CFLAGS = $(WARNCFLAGS)
185netpgpverify_SOURCES = verify.c 192netpgpverify_SOURCES = verify.c
186netpgpverify_CPPFLAGS = -I$(top_srcdir)/include 193netpgpverify_CPPFLAGS = -I$(top_srcdir)/include
 194netpgpverify_LDADD = ../lib/libnetpgp.la
187man1_MANS = netpgpverify.1 195man1_MANS = netpgpverify.1
188dist_man_MANS = netpgpverify.1 196dist_man_MANS = netpgpverify.1
189all: all-am 197all: all-am
190 198
191.SUFFIXES: 199.SUFFIXES:
192.SUFFIXES: .c .lo .o .obj 200.SUFFIXES: .c .lo .o .obj
193$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) 201$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
194 @for dep in $?; do \ 202 @for dep in $?; do \
195 case '$(am__configure_deps)' in \ 203 case '$(am__configure_deps)' in \
196 *$$dep*) \ 204 *$$dep*) \
197 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ 205 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
198 && exit 0; \ 206 && exit 0; \
199 exit 1;; \ 207 exit 1;; \