[git] GPGME - branch, master, updated. gpgme-1.6.0-298-g2972c44

[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  2972c44bd7e97b2169dea9c4a49d9754afdae3f0 (commit)
      from  be4ff75d7d5ac6ed15feb245ef3cec59b4bad561 (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 2972c44bd7e97b2169dea9c4a49d9754afdae3f0
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 23 15:55:55 2016 +0200

    core: Put the protocol into a TOFU created key object.
    
    * src/verify.c (parse_tofu_user): Add arg 'protocol' and store it in
    the KEY.
    (_gpgme_verify_status_handler): Pass protocol.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/verify.c b/src/verify.c
index 173d1cb..075f1d6 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -671,7 +671,7 @@ parse_trust (gpgme_signature_t sig, gpgme_status_code_t code, char *args)
 
 /* Parse a TOFU_USER line and put the info into SIG.  */
 static gpgme_error_t
-parse_tofu_user (gpgme_signature_t sig, char *args)
+parse_tofu_user (gpgme_signature_t sig, char *args, gpgme_protocol_t protocol)
 {
   gpg_error_t err;
   char *tail;
@@ -715,6 +715,7 @@ parse_tofu_user (gpgme_signature_t sig, char *args)
       if (err)
         goto leave;
       sig->key->fpr = fpr;
+      sig->key->protocol = protocol;
       fpr = NULL;
     }
   else if (!sig->key->fpr)
@@ -993,7 +994,7 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
 
     case GPGME_STATUS_TOFU_USER:
       opd->only_newsig_seen = 0;
-      return sig ? parse_tofu_user (sig, args)
+      return sig ? parse_tofu_user (sig, args, ctx->protocol)
         /*    */ : trace_gpg_error (GPG_ERR_INV_ENGINE);
 
     case GPGME_STATUS_TOFU_STATS:

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

Summary of changes:
 src/verify.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


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