diff options
| author | Ingo Klöcker <[email protected]> | 2024-06-12 08:45:11 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2024-06-12 08:45:11 +0000 |
| commit | 3b9815bd8ad723445128ae99883be0072ae389a6 (patch) | |
| tree | 9553f5d4c4cecf28ec1d1a68da24bd545535f731 /src/engine-gpgsm.c | |
| parent | qt,doc: Fix typos (diff) | |
| download | gpgme-3b9815bd8ad723445128ae99883be0072ae389a6.tar.gz gpgme-3b9815bd8ad723445128ae99883be0072ae389a6.zip | |
core: Allow setting import options when importing keys
* src/context.h (struct gpgme_context): New field import_options.
* src/engine-backend.h (struct engine_ops): Add arg import_options to
field 'import'.
* src/engine-gpg.c (gpg_import): Add arg import_options and pass option
--import-options with argument value to gpg.
* src/engine-gpgsm.c (gpgsm_import): Add dummy arg import_options.
* src/engine.c (_gpgme_engine_op_import): Add arg import_options and
pass option to import function of engine.
* src/engine.h (_gpgme_engine_op_import): Add arg import_options.
* src/gpgme.c (gpgme_release): Free 'import_options'.
(gpgme_set_ctx_flag, gpgme_get_ctx_flag): New flag "import-options".
* src/import.c (_gpgme_op_import_start, _gpgme_op_import_keys_start,
_gpgme_op_receive_keys_start): Pass import options stored in context to
_gpgme_engine_op_import.
* tests/run-import.c (show_usage, main): Add option --import-options.
--
This makes the --import-options option available in the GPGME API for
key imports.
GnuPG-bug-id: 7152
Diffstat (limited to 'src/engine-gpgsm.c')
| -rw-r--r-- | src/engine-gpgsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index fa89ae3f..8ee29de8 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -1795,7 +1795,7 @@ gpgsm_genkey (void *engine, static gpgme_error_t gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, const char *keyids[], const char *import_filter, - const char *key_origin) + const char *import_options, const char *key_origin) { engine_gpgsm_t gpgsm = engine; gpgme_error_t err; @@ -1803,6 +1803,7 @@ gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, int idx; (void)import_filter; + (void)import_options; (void)key_origin; if (!gpgsm) |