From efe7e11dfa2ff911b477ce748292e53e7a50347e Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Tue, 6 Sep 2016 16:28:45 +0200 Subject: [PATCH] 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. --- src/encrypt-sign.c | 2 +- src/encrypt.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/encrypt-sign.c b/src/encrypt-sign.c index 4f484e90..af6de63e 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 307c862b..40236544 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);