From a400958323d93036dca9c63135b167012ea64f8b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 7 Oct 2015 16:55:15 +0200 Subject: gpg: Remove unfinished experimental code to export as S-expressions. * g10/options.h (EXPORT_SEXP_FORMAT): Remove. (EXPORT_DANE_FORMAT): New. * g10/export.c (parse_export_options): Remove "export-sexp-format". (export_seckeys): Adjust for removed option. (export_secsubkeys): Ditto. (do_export): Prepare for DANE format. (build_sexp, build_sexp_seckey): Remove. (do_export_stream): Remove use of removed functions. Signed-off-by: Werner Koch --- g10/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/options.h') diff --git a/g10/options.h b/g10/options.h index f5b23dd18..694c29f8e 100644 --- a/g10/options.h +++ b/g10/options.h @@ -334,7 +334,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define EXPORT_RESET_SUBKEY_PASSWD (1<<3) #define EXPORT_MINIMAL (1<<4) #define EXPORT_CLEAN (1<<5) -#define EXPORT_SEXP_FORMAT (1<<6) +#define EXPORT_DANE_FORMAT (1<<6) #define LIST_SHOW_PHOTOS (1<<0) #define LIST_SHOW_POLICY_URLS (1<<1) -- cgit v1.2.3