aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine-gpgsm.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-08-24 15:17:11 +0000
committerWerner Koch <[email protected]>2017-08-24 15:17:11 +0000
commit47f61df0704485b8165c9cf2a27ad57bcd864239 (patch)
tree860f387301408fa7a5e4c3575b7c4b9f0fd941ff /src/engine-gpgsm.c
parentSet next version to 1.10.0 (diff)
downloadgpgme-47f61df0704485b8165c9cf2a27ad57bcd864239.tar.gz
gpgme-47f61df0704485b8165c9cf2a27ad57bcd864239.zip
core: New context flag "auto-key-retrieve"
* src/gpgme.c (gpgme_set_ctx_flag, gpgme_get_ctx_flag): New flag "auto-key-retrieve". * src/context.h (gpgme_context): New field auto_key_retrieve. * src/engine-backend.h (struct engine_ops): Add arg auto_key_retrieve to field 'decrypt'. * src/engine-gpg.c (gpg_decrypt): Add arg auto_key_retrieve and pass option --auto-key-retrieve to gpg. Adjust all callers. (gpg_verify): Ditto. * src/engine-gpgsm.c (gpgsm_decrypt): Add dummy arg auto_key_retrieve. * src/engine-uiserver.c (uiserver_decrypt): Ditto. * tests/run-verify.c (main): Add option --auto-key-retrieve. -- This makes the --auto-key-retrieve option available in the GPGME API. Test plan: Run GPGME_DEBUG=9:out tests/run-verify SIGNEDFILE with and without its new option --auto-key-retrieve and check in the trace stored in "out" whether --auto-key-retrieve was passed to gpg. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'src/engine-gpgsm.c')
-rw-r--r--src/engine-gpgsm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index f23b0bfd..e337fedd 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -1130,7 +1130,8 @@ static gpgme_error_t
gpgsm_decrypt (void *engine,
gpgme_decrypt_flags_t flags,
gpgme_data_t ciph, gpgme_data_t plain,
- int export_session_key, const char *override_session_key)
+ int export_session_key, const char *override_session_key,
+ int auto_key_retrieve)
{
engine_gpgsm_t gpgsm = engine;
gpgme_error_t err;
@@ -1142,6 +1143,9 @@ gpgsm_decrypt (void *engine,
(void)export_session_key;
(void)override_session_key;
+ /* --auto-key-retrieve is also not supported. */
+ (void)auto_key_retrieve;
+
if (!gpgsm)
return gpg_error (GPG_ERR_INV_VALUE);