aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS3
-rw-r--r--doc/gpgme.texi5
-rw-r--r--src/context.h3
-rw-r--r--src/engine-backend.h3
-rw-r--r--src/engine-gpg.c9
-rw-r--r--src/engine-gpgsm.c4
-rw-r--r--src/engine.c4
-rw-r--r--src/engine.h3
-rw-r--r--src/gpgme.c12
-rw-r--r--src/import.c4
-rw-r--r--tests/gpg/t-import.c23
-rw-r--r--tests/run-import.c16
12 files changed, 81 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index ff9bfd02..1331c13a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,14 @@
Noteworthy changes in version 1.16.1 (unreleased)
-------------------------------------------------
+ * New context flag "key-origin". [#5733]
+
* qt: Extend ChangeExpiryJob to change expiration of primary key
and of subkeys at the same time. [#4717]
* Interface changes relative to the 1.16.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ gpgme_set_ctx_flag EXTENDED: New flag 'key-origin'.
qt: ChangeExpiryJob::Option NEW.
qt: ChangeExpiryJob::Options NEW.
qt: ChangeExpiryJob::setOptions NEW.
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index df8cbdca..c37141a0 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -3201,6 +3201,11 @@ the expiration time to use for key signature expiration. Valid values
are documented in the GnuPG manual and the gpg man page under
the option @option{--default-cert-expire}.
+@item "key-origin"
+@since{1.16.1}
+The string given in @var{value} is passed to the GnuPG engine to set
+the origin of imported keys. Valid values are documented in the GnuPG
+manual and the gpg man page under the option @option{--key-origin}.
@end table
diff --git a/src/context.h b/src/context.h
index 2792a160..10d297f6 100644
--- a/src/context.h
+++ b/src/context.h
@@ -177,6 +177,9 @@ struct gpgme_context
/* The optional expiration date of a certification. */
char *cert_expire;
+ /* The optional key origin. */
+ char *key_origin;
+
/* The operation data hooked into the context. */
ctx_op_data_t op_data;
diff --git a/src/engine-backend.h b/src/engine-backend.h
index 8f90b6c7..d4047fbf 100644
--- a/src/engine-backend.h
+++ b/src/engine-backend.h
@@ -95,7 +95,8 @@ struct engine_ops
unsigned int extraflags,
gpgme_data_t pubkey, gpgme_data_t seckey);
gpgme_error_t (*import) (void *engine, gpgme_data_t keydata,
- gpgme_key_t *keyarray);
+ gpgme_key_t *keyarray,
+ const char *key_origin);
gpgme_error_t (*keylist) (void *engine, const char *pattern,
int secret_only, gpgme_keylist_mode_t mode,
int engine_flags);
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)
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index d5f0d7a9..647734fe 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -1696,13 +1696,15 @@ gpgsm_genkey (void *engine,
static gpgme_error_t
-gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray)
+gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray, const char *key_origin)
{
engine_gpgsm_t gpgsm = engine;
gpgme_error_t err;
gpgme_data_encoding_t dataenc;
int idx;
+ (void)key_origin;
+
if (!gpgsm)
return gpg_error (GPG_ERR_INV_VALUE);
diff --git a/src/engine.c b/src/engine.c
index 96b8d3a8..6baf1842 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -850,7 +850,7 @@ _gpgme_engine_op_tofu_policy (engine_t engine,
gpgme_error_t
_gpgme_engine_op_import (engine_t engine, gpgme_data_t keydata,
- gpgme_key_t *keyarray)
+ gpgme_key_t *keyarray, const char *key_origin)
{
if (!engine)
return gpg_error (GPG_ERR_INV_VALUE);
@@ -858,7 +858,7 @@ _gpgme_engine_op_import (engine_t engine, gpgme_data_t keydata,
if (!engine->ops->import)
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
- return (*engine->ops->import) (engine->engine, keydata, keyarray);
+ return (*engine->ops->import) (engine->engine, keydata, keyarray, key_origin);
}
diff --git a/src/engine.h b/src/engine.h
index d7ff542c..038c67cc 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -141,7 +141,8 @@ gpgme_error_t _gpgme_engine_op_tofu_policy (engine_t engine,
gpgme_tofu_policy_t policy);
gpgme_error_t _gpgme_engine_op_import (engine_t engine,
gpgme_data_t keydata,
- gpgme_key_t *keyarray);
+ gpgme_key_t *keyarray,
+ const char *key_origin);
gpgme_error_t _gpgme_engine_op_keylist (engine_t engine,
const char *pattern,
int secret_only,
diff --git a/src/gpgme.c b/src/gpgme.c
index 255d1165..2703cd72 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -254,6 +254,7 @@ gpgme_release (gpgme_ctx_t ctx)
free (ctx->auto_key_locate);
free (ctx->trust_model);
free (ctx->cert_expire);
+ free (ctx->key_origin);
_gpgme_engine_info_release (ctx->engine_info);
ctx->engine_info = NULL;
DESTROY_LOCK (ctx->lock);
@@ -586,6 +587,13 @@ gpgme_set_ctx_flag (gpgme_ctx_t ctx, const char *name, const char *value)
if (!ctx->cert_expire)
err = gpg_error_from_syserror ();
}
+ else if (!strcmp (name, "key-origin"))
+ {
+ free (ctx->key_origin);
+ ctx->key_origin = strdup (value);
+ if (!ctx->key_origin)
+ err = gpg_error_from_syserror ();
+ }
else
err = gpg_error (GPG_ERR_UNKNOWN_NAME);
@@ -659,6 +667,10 @@ gpgme_get_ctx_flag (gpgme_ctx_t ctx, const char *name)
{
return ctx->cert_expire? ctx->cert_expire : "";
}
+ else if (!strcmp (name, "key-origin"))
+ {
+ return ctx->key_origin? ctx->key_origin : "";
+ }
else
return NULL;
}
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);
}
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;
}
diff --git a/tests/run-import.c b/tests/run-import.c
index 36d9a0d5..0ddf158d 100644
--- a/tests/run-import.c
+++ b/tests/run-import.c
@@ -46,6 +46,7 @@ show_usage (int ex)
" --verbose run in verbose mode\n"
" --openpgp use the OpenPGP protocol (default)\n"
" --cms use the CMS protocol\n"
+ " --key-origin use the specified key origin\n"
" --url import from given URLs\n"
" -0 URLs are delimited by a nul\n"
, stderr);
@@ -63,6 +64,7 @@ main (int argc, char **argv)
gpgme_import_result_t impres;
gpgme_data_t data;
gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
+ char *key_origin = NULL;
if (argc)
{ argc--; argv++; }
@@ -101,6 +103,14 @@ main (int argc, char **argv)
protocol = GPGME_PROTOCOL_CMS;
argc--; argv++;
}
+ else if (!strcmp (*argv, "--key-origin"))
+ {
+ argc--; argv++;
+ if (!argc)
+ show_usage (1);
+ key_origin = strdup (*argv);
+ argc--; argv++;
+ }
else if (!strncmp (*argv, "--", 2))
show_usage (1);
@@ -115,6 +125,12 @@ main (int argc, char **argv)
fail_if_err (err);
gpgme_set_protocol (ctx, protocol);
+ if (key_origin)
+ {
+ err = gpgme_set_ctx_flag (ctx, "key-origin", key_origin);
+ fail_if_err (err);
+ }
+
for (; argc; argc--, argv++)
{
printf ("reading file `%s'\n", *argv);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 13:12:12 +0000