[git] GnuPG - branch, master, updated. gnupg-2.2.7-226-g78f542e

[by NIIBE Yutaka]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  78f542e1f4495195db2e668f9cd41657fb1afc77 (commit)
      from  4ed941ff26783c4fabfe2079029f8e436eb7e340 (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 78f542e1f4495195db2e668f9cd41657fb1afc77
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 15 11:10:15 2018 +0900

    scd: Fix signing authentication status.
    
    * scd/app-openpgp.c (do_sign): Clear DID_CHV1 after signing.
    
    --
    
    We have a corner case: In "not forced" situation and authenticated,
    and it is changed to "forced", card implementaiton can actually accept
    signing, but GnuPG requires authentication, because it is "forced".
    
    GnuPG-bug-id: 4177
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 8df9fab..87804f5 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -4393,7 +4393,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
   log_info (_("signatures created so far: %lu\n"), sigcount);
 
   /* Check CHV if needed.  */
-  if (!app->did_chv1 || app->force_chv1 )
+  if (!app->did_chv1 || app->force_chv1)
     {
       char *pinvalue;
       int pinlen;
@@ -4441,6 +4441,9 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
     }
   rc = iso7816_compute_ds (app->slot, exmode, data, datalen, le_value,
                            outdata, outdatalen);
+  if (!rc && app->force_chv1)
+    app->did_chv1 = 0;
+
   return rc;
 }
 

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

Summary of changes:
 scd/app-openpgp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org