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/engine-gpg.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/engine-gpg.c')
| -rw-r--r-- | src/engine-gpg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index ff037920..9591c60a 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -2766,7 +2766,8 @@ 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) +gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, + const char *key_origin) { engine_gpg_t gpg = engine; gpgme_error_t err; @@ -2830,6 +2831,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray) else { err = add_arg (gpg, "--import"); + if (!err && key_origin) + { + err = add_arg (gpg, "--key-origin"); + if (!err) + err = add_arg (gpg, key_origin); + } if (!err) err = add_arg (gpg, "--"); if (!err) |