diff options
| author | Ingo Klöcker <[email protected]> | 2021-12-13 15:52:23 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-12-13 15:52:23 +0000 |
| commit | 60880adafa93e1a1e8e9fecf03c14d56bbd55345 (patch) | |
| tree | 881579c7b75cbaaa800224eb981e6c15e15b4b9e /src/import.c | |
| parent | doc: Fix a few errors in the documentation of gpgme_op_import_* (diff) | |
| download | gpgme-60880adafa93e1a1e8e9fecf03c14d56bbd55345.tar.gz gpgme-60880adafa93e1a1e8e9fecf03c14d56bbd55345.zip | |
core: Allow specifiying a key origin when importing keys
* src/context.h (struct gpgme_context): New field key_origin.
* src/engine-backend.h (struct engine_ops): Add arg key_origin to
field 'import'.
* src/engine-gpg.c (gpg_import): Add arg key_origin and pass option
--key-origin with argument value to gpg. Adjust all callers.
* src/engine-gpgsm.c (gpgsm_import): Add dummy arg key_origin.
* src/gpgme.c (gpgme_release): Free 'key_origin'.
(gpgme_set_ctx_flag, gpgme_get_ctx_flag): New flag "key-origin".
* tests/run-import.c (main): Add option --key-origin.
* tests/gpg/t-import.c (main): Set and verify key origin.
--
This makes the --key-origin option available in the GPGME API for
key imports.
GnuPG-bug-id: 5733
Diffstat (limited to 'src/import.c')
| -rw-r--r-- | src/import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/import.c b/src/import.c index 2834aec2..5dc74907 100644 --- a/src/import.c +++ b/src/import.c @@ -282,7 +282,7 @@ _gpgme_op_import_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t keydata) _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx); - return _gpgme_engine_op_import (ctx->engine, keydata, NULL); + return _gpgme_engine_op_import (ctx->engine, keydata, NULL, ctx->key_origin); } @@ -365,7 +365,7 @@ _gpgme_op_import_keys_start (gpgme_ctx_t ctx, int synchronous, _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx); - return _gpgme_engine_op_import (ctx->engine, NULL, keys); + return _gpgme_engine_op_import (ctx->engine, NULL, keys, ctx->key_origin); } |