From d35d44efaf72f90ee4f92af8382c4bcb9982da3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Tue, 14 Dec 2021 15:44:37 +0100 Subject: core: Allow setting import filters when importing keys * src/context.h (struct gpgme_context): New field import_filter. * src/engine-backend.h (struct engine_ops): Add arg import_filter to field 'import'. * src/engine-gpg.c (gpg_import): Add arg import_filter and pass option --import-filter with argument value to gpg. Adjust all callers. * src/engine-gpgsm.c (gpgsm_import): Add dummy arg import_filter. * src/gpgme.c (gpgme_release): Free 'import_filter'. (gpgme_set_ctx_flag, gpgme_get_ctx_flag): New flag "import-filter". * tests/run-import.c (main): Add option --import-filter. -- This makes the --import-filter option available in the GPGME API for key imports. GnuPG-bug-id: 5739 --- src/engine.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/engine.c') diff --git a/src/engine.c b/src/engine.c index 6baf1842..0b90d5b4 100644 --- a/src/engine.c +++ b/src/engine.c @@ -850,7 +850,8 @@ _gpgme_engine_op_tofu_policy (engine_t engine, gpgme_error_t _gpgme_engine_op_import (engine_t engine, gpgme_data_t keydata, - gpgme_key_t *keyarray, const char *key_origin) + gpgme_key_t *keyarray, const char *import_filter, + const char *key_origin) { if (!engine) return gpg_error (GPG_ERR_INV_VALUE); @@ -858,7 +859,8 @@ _gpgme_engine_op_import (engine_t engine, gpgme_data_t keydata, if (!engine->ops->import) return gpg_error (GPG_ERR_NOT_IMPLEMENTED); - return (*engine->ops->import) (engine->engine, keydata, keyarray, key_origin); + return (*engine->ops->import) (engine->engine, keydata, keyarray, import_filter, + key_origin); } -- cgit v1.2.3