aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine-gpg.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index aed933e1..17fba809 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -1694,7 +1694,14 @@ gpg_decrypt (void *engine,
strlen (override_session_key), 1);
if (!err)
{
- err = add_arg (gpg, "--override-session-key-fd");
+ /* We add --no-keyring because a keyring is not required
+ * when we are overriding the session key. It would
+ * work without that option but --no-keyring avoids that
+ * gpg return a failure due to a missing key log_error()
+ * diagnostic. --no-keyring is supported since 2.1.14. */
+ err = add_arg (gpg, "--no-keyring");
+ if (!err)
+ err = add_arg (gpg, "--override-session-key-fd");
if (!err)
err = add_data (gpg, gpg->override_session_key, -2, 0);
}