aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg
diff options
context:
space:
mode:
authorIngo Klöcker <[email protected]>2021-12-13 15:52:23 +0000
committerIngo Klöcker <[email protected]>2021-12-13 15:52:23 +0000
commit60880adafa93e1a1e8e9fecf03c14d56bbd55345 (patch)
tree881579c7b75cbaaa800224eb981e6c15e15b4b9e /tests/gpg
parentdoc: Fix a few errors in the documentation of gpgme_op_import_* (diff)
downloadgpgme-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 'tests/gpg')
-rw-r--r--tests/gpg/t-import.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index ae822630..159e5652 100644
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -214,6 +214,7 @@ main (int argc, char *argv[])
gpgme_error_t err;
gpgme_data_t in;
gpgme_import_result_t result;
+ gpgme_key_t key;
char *pubkey_1_asc = make_filename ("pubkey-1.asc");
char *seckey_1_asc = make_filename ("seckey-1.asc");
@@ -225,6 +226,9 @@ main (int argc, char *argv[])
err = gpgme_new (&ctx);
fail_if_err (err);
+ err = gpgme_set_ctx_flag (ctx, "key-origin", "wkd,https://openpgpkey.gnupg.org");
+ fail_if_err (err);
+
err = gpgme_data_new_from_file (&in, pubkey_1_asc, 1);
free (pubkey_1_asc);
fail_if_err (err);
@@ -246,5 +250,24 @@ main (int argc, char *argv[])
gpgme_data_release (in);
gpgme_release (ctx);
+
+ err = gpgme_new (&ctx);
+ fail_if_err (err);
+
+ err = gpgme_get_key (ctx, "0xADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", &key, 0);
+ fail_if_err (err);
+
+ if (!key)
+ {
+ fprintf (stderr, "Imported key not found\n");
+ exit (1);
+ }
+ if (key->origin != GPGME_KEYORG_WKD)
+ {
+ fprintf (stderr, "Key has unexpected origin: %d\n", key->origin);
+ exit (1);
+ }
+
+
return 0;
}