aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS5
-rw-r--r--doc/gpgme.texi6
-rw-r--r--src/context.h3
-rw-r--r--src/engine-backend.h2
-rw-r--r--src/engine-gpg.c17
-rw-r--r--src/engine-gpgsm.c8
-rw-r--r--src/engine.c8
-rw-r--r--src/engine.h5
-rw-r--r--src/export.c4
-rw-r--r--src/gpgme.c12
-rw-r--r--tests/run-export.c15
11 files changed, 71 insertions, 14 deletions
diff --git a/NEWS b/NEWS
index 6a9aa716..8eab75fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
Noteworthy changes in version 2.0.2 (unreleased) [C45/A0/R)]
------------------------------------------------
+ * New context flag "export-filter". [T8033]
+
+ * Interface changes relative to the 2.0.1 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ gpgme_set_ctx_flag EXTENDED: New flag 'export-filter'.
Noteworthy changes in version 2.0.1 (2025-09-23) [C45/A0/R1]
------------------------------------------------
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 90100979..d1c1a3f1 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -3270,6 +3270,12 @@ the expiration time to use for key signature expiration. Valid values
are documented in the GnuPG manual and the gpg man page under
the option @option{--default-cert-expire}.
+@item "export-filter"
+@since{2.0.2}
+The string given in @var{value} is passed to the GnuPG engine to use as
+filter when exporting keys. Valid values are documented in the GnuPG
+manual and the gpg man page under the option @option{--export-filter}.
+
@item "key-origin"
@since{1.16.1}
The string given in @var{value} is passed to the GnuPG engine to set
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;
}
diff --git a/tests/run-export.c b/tests/run-export.c
index 3e328826..c82c1137 100644
--- a/tests/run-export.c
+++ b/tests/run-export.c
@@ -62,6 +62,7 @@ show_usage (int ex)
" --secret-subkey export secret subkeys instead of public keys\n"
" --raw use PKCS#1 as secret key format\n"
" --pkcs12 use PKCS#12 as secret key format\n"
+ " --export-filter use the specified export filter\n"
, stderr);
exit (ex);
}
@@ -80,6 +81,7 @@ main (int argc, char **argv)
gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
gpgme_export_mode_t mode = 0;
int print_status = 0;
+ char *export_filter = NULL;
if (argc)
{ argc--; argv++; }
@@ -144,6 +146,14 @@ main (int argc, char **argv)
mode |= GPGME_EXPORT_MODE_PKCS12;
argc--; argv++;
}
+ else if (!strcmp (*argv, "--export-filter"))
+ {
+ argc--; argv++;
+ if (!argc)
+ show_usage (1);
+ export_filter = strdup (*argv);
+ argc--; argv++;
+ }
else if (!strncmp (*argv, "--", 2))
show_usage (1);
@@ -162,6 +172,11 @@ main (int argc, char **argv)
gpgme_set_status_cb (ctx, status_cb, NULL);
gpgme_set_ctx_flag (ctx, "full-status", "1");
}
+ if (export_filter)
+ {
+ err = gpgme_set_ctx_flag (ctx, "export-filter", export_filter);
+ fail_if_err (err);
+ }
err = gpgme_data_new (&out);
fail_if_err (err);
generated by cgit (git 2.51.2) at 2026-09-16 10:42:39 +0200