[git] GPGME - branch, master, updated. gpgme-1.6.0-328-g151da95

[by Andre Heinecke]

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  151da95470f174dc770b2111890ad650a1697276 (commit)
       via  e8cb143c8337b122a6790f769ddb0a97c4baccd3 (commit)
       via  efe7e11dfa2ff911b477ce748292e53e7a50347e (commit)
      from  ab3fbdbd05cfd1b039bb5b1eb3941fbb4bcf6307 (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 151da95470f174dc770b2111890ad650a1697276
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 6 16:32:01 2016 +0200

    tests: Set passphrase cb in t-encrypt-mixed
    
    * tests/gpg/t-encrypt-mixed.c (main): Set passphrase cb.
    
    --
    This fixes the test when run without an agent and our
    faked pinentry program.

diff --git a/tests/gpg/t-encrypt-mixed.c b/tests/gpg/t-encrypt-mixed.c
index 6ad976a..488b1ce 100644
--- a/tests/gpg/t-encrypt-mixed.c
+++ b/tests/gpg/t-encrypt-mixed.c
@@ -59,6 +59,8 @@ main (int argc, char *argv[])
   err = gpgme_data_new (&out);
   fail_if_err (err);
 
+  gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
+
   /* A recipient for which we don't have a secret key */
   err = gpgme_get_key (ctx, "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2",
                        &key[0], 0);

commit e8cb143c8337b122a6790f769ddb0a97c4baccd3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 6 16:30:24 2016 +0200

    core: Check for gpg version for loopback mode
    
    * src/engine-gpg.c (build_argv): Check for version 2.1.0
    before adding pinentry-mode.
    
    --
    This is a compatibility fix for older versions that don't support
    this flag which would otherwise result in an invalid argument
    error.

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 7036ee0..3f77ba8 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -866,7 +866,7 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
       argc++;
     }
 
-  if (gpg->pinentry_mode)
+  if (gpg->pinentry_mode && have_gpg_version (gpg, "2.1.0"))
     {
       const char *s = NULL;
       switch (gpg->pinentry_mode)

commit efe7e11dfa2ff911b477ce748292e53e7a50347e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 6 16:28:45 2016 +0200

    core: Fix passphrase cb for mixed sym encrypt
    
    * src/encrypt.c (encrypt_start): Handle SYMMETRIC flag.
    * src/encrypt-sign.c (encrypt_sign_start): Ditto.
    
    --
    This causes the passphrace command handler to be properly
    registered which in turn will result in the passphrase
    callback beeing called.

diff --git a/src/encrypt-sign.c b/src/encrypt-sign.c
index 4f484e9..af6de63 100644
--- a/src/encrypt-sign.c
+++ b/src/encrypt-sign.c
@@ -72,7 +72,7 @@ encrypt_sign_start (gpgme_ctx_t ctx, int synchronous, gpgme_key_t recp[],
   if (err)
     return err;
 
-  symmetric = !recp;
+  symmetric = !recp || (flags & GPGME_ENCRYPT_SYMMETRIC);
 
   if (!plain)
     return gpg_error (GPG_ERR_NO_DATA);
diff --git a/src/encrypt.c b/src/encrypt.c
index 307c862..4023654 100644
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -228,8 +228,7 @@ encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_key_t recp[],
   if (err)
     return err;
 
-  if (!recp)
-    symmetric = 1;
+  symmetric = !recp || (flags & GPGME_ENCRYPT_SYMMETRIC);
 
   if (!plain)
     return gpg_error (GPG_ERR_NO_DATA);

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

Summary of changes:
 src/encrypt-sign.c          | 2 +-
 src/encrypt.c               | 3 +--
 src/engine-gpg.c            | 2 +-
 tests/gpg/t-encrypt-mixed.c | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)


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