* options.h, main.h, export.c (parse_export_options, do_export_stream),

g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".

* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.

* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.

1 files changed, 9 insertions, 4 deletions

diff --git a/g10/main.h b/g10/main.h
index ec0efd3c8..4d705b093 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -159,10 +159,15 @@ void import_print_stats (void *hd);
 int collapse_uids( KBNODE *keyblock );
 
 /*-- export.c --*/
-#define EXPORT_FLAG_ONLYRFC     1
-#define EXPORT_FLAG_SKIPATTRIBS 2
-int export_pubkeys( STRLIST users, int flags );
-int export_pubkeys_stream( IOBUF out, STRLIST users, int flags );
+#define EXPORT_INCLUDE_NON_RFC    1
+#define EXPORT_INCLUDE_LOCAL_SIGS 2
+#define EXPORT_INCLUDE_ATTRIBUTES 4
+#define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8
+#define EXPORT_DEFAULT (1|4)
+
+int parse_export_options(char *str,unsigned int *options);
+int export_pubkeys( STRLIST users, unsigned int options );
+int export_pubkeys_stream( IOBUF out, STRLIST users, unsigned int options );
 int export_seckeys( STRLIST users );
 int export_secsubkeys( STRLIST users );