From 1823e06216f2e9eee302ae1233d635a4a92c03f6 Mon Sep 17 00:00:00 2001 From: Ingo Klöcker Date: Wed, 14 Jan 2026 13:58:49 +0100 Subject: Allow setting export filters when exporting keys * src/context.h (struct gpgme_context): New field export_filter. * src/engine-backend.h (struct engine_ops): Add arg export_filter to field 'export' and field 'export_ext'. * src/engine-gpg.c (export_common): Add arg export_filter and pass option --export-filter with argument value to gpg. (gpg_export, gpg_export_ext): Add arg export_filter and pass it to export_common. Adjust all callers of the two functions. * src/engine-gpgsm.c (gpgsm_export, gpgsm_export_ext): Add dummy arg export_filter. * src/gpgme.c (gpgme_release): Free 'export_filter'. (gpgme_set_ctx_flag, gpgme_get_ctx_flag): New flag "export-filter". * tests/run-export.c (main): Add option --export-filter. -- This makes the --export-filter option available in the GPGME API for key exports. GnuPG-bug-id: 8033 --- src/context.h | 3 +++ src/engine-backend.h | 2 ++ src/engine-gpg.c | 17 ++++++++++++----- src/engine-gpgsm.c | 8 ++++++-- src/engine.c | 8 ++++---- src/engine.h | 5 ++++- src/export.c | 4 ++-- src/gpgme.c | 12 ++++++++++++ 8 files changed, 45 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/context.h b/src/context.h index ba9b83ef..8789f564 100644 --- a/src/context.h +++ b/src/context.h @@ -196,6 +196,9 @@ struct gpgme_context * options. */ char *known_notations; + /* The optional export filter. */ + char *export_filter; + /* The operation data hooked into the context. */ ctx_op_data_t op_data; diff --git a/src/engine-backend.h b/src/engine-backend.h index b0533f77..00808bb8 100644 --- a/src/engine-backend.h +++ b/src/engine-backend.h @@ -83,9 +83,11 @@ struct engine_ops int use_armor, gpgme_ctx_t ctx /* FIXME */); gpgme_error_t (*export) (void *engine, const char *pattern, gpgme_export_mode_t mode, gpgme_data_t keydata, + const char *export_filter, int use_armor); gpgme_error_t (*export_ext) (void *engine, const char *pattern[], gpgme_export_mode_t mode, gpgme_data_t keydata, + const char *export_filter, int use_armor); gpgme_error_t (*genkey) (void *engine, const char *userid, const char *algo, diff --git a/src/engine-gpg.c b/src/engine-gpg.c index c3c0b9d4..b43740bd 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -2783,7 +2783,8 @@ gpg_encrypt_sign (void *engine, gpgme_key_t recp[], static gpgme_error_t export_common (engine_gpg_t gpg, gpgme_export_mode_t mode, - gpgme_data_t keydata, int use_armor) + gpgme_data_t keydata, const char *export_filter, + int use_armor) { gpgme_error_t err = 0; @@ -2798,6 +2799,12 @@ export_common (engine_gpg_t gpg, gpgme_export_mode_t mode, { err = add_arg (gpg, "--export-options=export-minimal"); } + if (!err && export_filter && have_gpg_version (gpg, "2.1.14")) + { + err = add_arg (gpg, "--export-filter"); + if (!err) + err = add_arg (gpg, export_filter); + } if (err) ; @@ -2836,12 +2843,12 @@ export_common (engine_gpg_t gpg, gpgme_export_mode_t mode, static gpgme_error_t gpg_export (void *engine, const char *pattern, gpgme_export_mode_t mode, - gpgme_data_t keydata, int use_armor) + gpgme_data_t keydata, const char *export_filter, int use_armor) { engine_gpg_t gpg = engine; gpgme_error_t err; - err = export_common (gpg, mode, keydata, use_armor); + err = export_common (gpg, mode, keydata, export_filter, use_armor); if (!err && pattern && *pattern) err = add_arg (gpg, pattern); @@ -2855,12 +2862,12 @@ gpg_export (void *engine, const char *pattern, gpgme_export_mode_t mode, static gpgme_error_t gpg_export_ext (void *engine, const char *pattern[], gpgme_export_mode_t mode, - gpgme_data_t keydata, int use_armor) + gpgme_data_t keydata, const char *export_filter, int use_armor) { engine_gpg_t gpg = engine; gpgme_error_t err; - err = export_common (gpg, mode, keydata, use_armor); + err = export_common (gpg, mode, keydata, export_filter, use_armor); if (pattern) { diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index d464aeed..206d3e4b 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -1672,12 +1672,14 @@ gpgsm_encrypt (void *engine, gpgme_key_t recp[], const char *recpstring, static gpgme_error_t gpgsm_export (void *engine, const char *pattern, gpgme_export_mode_t mode, - gpgme_data_t keydata, int use_armor) + gpgme_data_t keydata, const char *export_filter, int use_armor) { engine_gpgsm_t gpgsm = engine; gpgme_error_t err = 0; char *cmd; + (void)export_filter; + if (!gpgsm) return gpg_error (GPG_ERR_INV_VALUE); @@ -1727,7 +1729,7 @@ gpgsm_export (void *engine, const char *pattern, gpgme_export_mode_t mode, static gpgme_error_t gpgsm_export_ext (void *engine, const char *pattern[], gpgme_export_mode_t mode, - gpgme_data_t keydata, int use_armor) + gpgme_data_t keydata, const char *export_filter, int use_armor) { engine_gpgsm_t gpgsm = engine; gpgme_error_t err = 0; @@ -1736,6 +1738,8 @@ gpgsm_export_ext (void *engine, const char *pattern[], gpgme_export_mode_t mode, int length = 7 + 9 + 9 + 1; char *linep; + (void)export_filter; + if (!gpgsm) return gpg_error (GPG_ERR_INV_VALUE); diff --git a/src/engine.c b/src/engine.c index d341488e..d750f7bb 100644 --- a/src/engine.c +++ b/src/engine.c @@ -760,7 +760,7 @@ _gpgme_engine_op_encrypt_sign (engine_t engine, gpgme_key_t recp[], gpgme_error_t _gpgme_engine_op_export (engine_t engine, const char *pattern, gpgme_export_mode_t mode, gpgme_data_t keydata, - int use_armor) + const char *export_filter, int use_armor) { if (!engine) return gpg_error (GPG_ERR_INV_VALUE); @@ -769,14 +769,14 @@ _gpgme_engine_op_export (engine_t engine, const char *pattern, return gpg_error (GPG_ERR_NOT_IMPLEMENTED); return (*engine->ops->export) (engine->engine, pattern, mode, - keydata, use_armor); + keydata, export_filter, use_armor); } gpgme_error_t _gpgme_engine_op_export_ext (engine_t engine, const char *pattern[], unsigned int reserved, gpgme_data_t keydata, - int use_armor) + const char *export_filter, int use_armor) { if (!engine) return gpg_error (GPG_ERR_INV_VALUE); @@ -785,7 +785,7 @@ _gpgme_engine_op_export_ext (engine_t engine, const char *pattern[], return gpg_error (GPG_ERR_NOT_IMPLEMENTED); return (*engine->ops->export_ext) (engine->engine, pattern, reserved, - keydata, use_armor); + keydata, export_filter, use_armor); } diff --git a/src/engine.h b/src/engine.h index 7befec90..3b68d47a 100644 --- a/src/engine.h +++ b/src/engine.h @@ -111,11 +111,14 @@ gpgme_error_t _gpgme_engine_op_encrypt_sign (engine_t engine, gpgme_ctx_t ctx /* FIXME */); gpgme_error_t _gpgme_engine_op_export (engine_t engine, const char *pattern, gpgme_export_mode_t mode, - gpgme_data_t keydata, int use_armor); + gpgme_data_t keydata, + const char *export_filter, + int use_armor); gpgme_error_t _gpgme_engine_op_export_ext (engine_t engine, const char *pattern[], gpgme_export_mode_t mode, gpgme_data_t keydata, + const char *export_filter, int use_armor); gpgme_error_t _gpgme_engine_op_genkey (engine_t engine, const char *userid, const char *algo, diff --git a/src/export.c b/src/export.c index 090db8b5..59bdfbc9 100644 --- a/src/export.c +++ b/src/export.c @@ -219,7 +219,7 @@ export_start (gpgme_ctx_t ctx, int synchronous, const char *pattern, _gpgme_engine_set_status_handler (ctx->engine, export_status_handler, ctx); return _gpgme_engine_op_export (ctx->engine, pattern, mode, keydata, - ctx->use_armor); + ctx->export_filter, ctx->use_armor); } @@ -294,7 +294,7 @@ export_ext_start (gpgme_ctx_t ctx, int synchronous, const char *pattern[], _gpgme_engine_set_status_handler (ctx->engine, export_status_handler, ctx); return _gpgme_engine_op_export_ext (ctx->engine, pattern, mode, keydata, - ctx->use_armor); + ctx->export_filter, ctx->use_armor); } diff --git a/src/gpgme.c b/src/gpgme.c index f37d3fa6..7025b20b 100644 --- a/src/gpgme.c +++ b/src/gpgme.c @@ -263,6 +263,7 @@ gpgme_release (gpgme_ctx_t ctx) free (ctx->import_filter); free (ctx->import_options); free (ctx->known_notations); + free (ctx->export_filter); _gpgme_engine_info_release (ctx->engine_info); ctx->engine_info = NULL; DESTROY_LOCK (ctx->lock); @@ -631,6 +632,13 @@ gpgme_set_ctx_flag (gpgme_ctx_t ctx, const char *name, const char *value) if (!ctx->known_notations) err = gpg_error_from_syserror (); } + else if (!strcmp (name, "export-filter")) + { + free (ctx->export_filter); + ctx->export_filter = strdup (value); + if (!ctx->export_filter) + err = gpg_error_from_syserror (); + } else err = gpg_error (GPG_ERR_UNKNOWN_NAME); @@ -728,6 +736,10 @@ gpgme_get_ctx_flag (gpgme_ctx_t ctx, const char *name) { return ctx->known_notations? ctx->known_notations: ""; } + else if (!strcmp (name, "export-filter")) + { + return ctx->export_filter? ctx->export_filter : ""; + } else return NULL; } -- cgit