From 47f61df0704485b8165c9cf2a27ad57bcd864239 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 24 Aug 2017 17:17:11 +0200 Subject: 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 --- src/engine-uiserver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/engine-uiserver.c') diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c index 3db705d8..bc3f3fbd 100644 --- a/src/engine-uiserver.c +++ b/src/engine-uiserver.c @@ -962,7 +962,8 @@ static gpgme_error_t uiserver_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_uiserver_t uiserver = engine; gpgme_error_t err; @@ -972,6 +973,8 @@ uiserver_decrypt (void *engine, (void)override_session_key; /* Fixme: We need to see now to add this * to the UI server protocol */ + (void)auto_key_retrieve; /* Not yet supported. */ + if (!uiserver) return gpg_error (GPG_ERR_INV_VALUE); -- cgit v1.2.3