diff options
| author | Ingo Klöcker <[email protected]> | 2021-12-14 14:44:37 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-12-14 14:44:37 +0000 |
| commit | d35d44efaf72f90ee4f92af8382c4bcb9982da3f (patch) | |
| tree | 90e0e4e08394a6ac3d3a43f7e40c6d4ac39dcb8f /src/engine-gpg.c | |
| parent | qt: Add pattern used for WKD lookup to result (diff) | |
| download | gpgme-d35d44efaf72f90ee4f92af8382c4bcb9982da3f.tar.gz gpgme-d35d44efaf72f90ee4f92af8382c4bcb9982da3f.zip | |
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
Diffstat (limited to 'src/engine-gpg.c')
| -rw-r--r-- | src/engine-gpg.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index fe9ff101..fd39ad76 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -2767,7 +2767,7 @@ string_from_data (gpgme_data_t data, int delim, static gpgme_error_t gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, - const char *key_origin) + const char *import_filter, const char *key_origin) { engine_gpg_t gpg = engine; gpgme_error_t err; @@ -2782,6 +2782,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, if (keyarray) { err = add_arg (gpg, "--recv-keys"); + if (!err && import_filter && have_gpg_version (gpg, "2.1.14")) + { + err = add_arg (gpg, "--import-filter"); + if (!err) + err = add_arg (gpg, import_filter); + } if (!err) err = add_arg (gpg, "--"); for (idx=0; !err && keyarray[idx]; idx++) @@ -2813,6 +2819,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, should use an option to gpg to modify such commands (ala --multifile). */ err = add_arg (gpg, "--fetch-keys"); + if (!err && import_filter && have_gpg_version (gpg, "2.1.14")) + { + err = add_arg (gpg, "--import-filter"); + if (!err) + err = add_arg (gpg, import_filter); + } if (!err) err = add_arg (gpg, "--"); helpptr = NULL; @@ -2831,6 +2843,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, else { err = add_arg (gpg, "--import"); + if (!err && import_filter && have_gpg_version (gpg, "2.1.14")) + { + err = add_arg (gpg, "--import-filter"); + if (!err) + err = add_arg (gpg, import_filter); + } if (!err && key_origin && have_gpg_version (gpg, "2.1.22")) { err = add_arg (gpg, "--key-origin"); |