[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.10-8-g7e2b048

[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, STABLE-BRANCH-2-2 has been updated
       via  7e2b0488d13561be2b754e28801de654747a8dcc (commit)
      from  8f844ae1cd16e27ad07d45784b1f0ff2917da2b8 (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 7e2b0488d13561be2b754e28801de654747a8dcc
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.
    
    --
    
    Cherry-picked from master commit of:
    	78f542e1f4495195db2e668f9cd41657fb1afc77
    
    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 9fcfa19..911bd88 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -4381,7 +4381,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;
@@ -4429,6 +4429,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