[git] GPGME - branch, master, updated. gpgme-1.12.0-44-gbded8eb

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  bded8ebc59c7fdad2617f4c9232a58047656834c (commit)
      from  13e09bd21a531b448f2f34b1f075315502b76fb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bded8ebc59c7fdad2617f4c9232a58047656834c
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Nov 5 10:30:27 2018 +0100

    gpg: Avoid error diagnostics with --override-session-key.
    
    * src/engine-gpg.c (gpg_decrypt): Add --no-keyring.
    --
    
    GnuPG-bug-id: 3464
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index aed933e..17fba80 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);
             }

-----------------------------------------------------------------------

Summary of changes:
 src/engine-gpg.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org