diff options
| author | Ingo Klöcker <[email protected]> | 2022-01-31 14:59:55 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2022-02-03 14:56:30 +0000 |
| commit | 3c2cff74b535422532e1256ee8177fa9c03eaf18 (patch) | |
| tree | e4d10ecb036e2ce0d15ba845e77be08b2b954970 /src/engine-gpg.c | |
| parent | doc: Fixed type of an object member (diff) | |
| download | gpgme-3c2cff74b535422532e1256ee8177fa9c03eaf18.tar.gz gpgme-3c2cff74b535422532e1256ee8177fa9c03eaf18.zip | |
core: New function gpgme_op_receive_keys
* src/gpgme.h.in (gpgme_op_receive_keys_start, gpgme_op_receive_keys):
New.
* src/gpgme.def, src/libgpgme.vers: Add them.
* src/engine-backend.h (struct engine_ops): Add arg keyids to field
'import'.
* src/engine.h, src/engine.c (_gpgme_engine_op_import): Add arg keyids.
* src/engine.c (_gpgme_engine_op_import): Forward new arg keyids.
* src/import.c: (_gpgme_op_import_start, _gpgme_op_import_keys_start):
Pass NULL to new arg of _gpgme_op_import_start.
(_gpgme_op_receive_keys_start, gpgme_op_receive_keys_start,
gpgme_op_receive_keys): New.
* src/engine-gpg.c (gpg_import): Add arg keyids. Extend check for
valid arguments. Build command line if keyids are given.
* src/engine-gpgsm.c (gpgsm_import): Add arg keyids. Return error if
keyids is not NULL.
tests/run-receive-keys.c: New.
tests/Makefile.am (noinst_PROGRAMS): Add new test runner.
--
The new function allows importing keys given by their key ids or
fingerprints from a keyserver (like gpg's --recv-keys command).
GnuPG-bug-id: 5808
Diffstat (limited to 'src/engine-gpg.c')
| -rw-r--r-- | src/engine-gpg.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index f619a646..88a248d2 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -2770,19 +2770,34 @@ 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 *import_filter, const char *key_origin) + const char *keyids[], const char *import_filter, + const char *key_origin) { engine_gpg_t gpg = engine; gpgme_error_t err; int idx; gpgme_data_encoding_t dataenc; - if (keydata && keyarray) + if ((keydata && keyarray) || (keydata && keyids) || (keyarray && keyids)) return gpg_error (GPG_ERR_INV_VALUE); /* Only one is allowed. */ dataenc = gpgme_data_get_encoding (keydata); - if (keyarray) + if (keyids) + { + 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, "--"); + while (!err && *keyids && **keyids) + err = add_arg (gpg, *(keyids++)); + } + else if (keyarray) { err = add_arg (gpg, "--recv-keys"); if (!err && import_filter && have_gpg_version (gpg, "2.1.14")) |