[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-42-gcb1731c

[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  cb1731c23cddfa524d3f51cfd82029bff853a073 (commit)
      from  a17d2d1f690ebe5d005b4589a5fe378b6487c657 (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 cb1731c23cddfa524d3f51cfd82029bff853a073
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Apr 3 20:30:29 2018 +0900

    scd: Writing KDF resets auth state.
    
    * scd/app-openpgp.c (do_setattr): Clear auth state.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index ab57d90..9fcfa19 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2459,7 +2459,7 @@ do_setattr (app_t app, const char *name,
     { "SM-KEY-MAC",   0x00D2, 3, 0, 1 },
     { "KEY-ATTR",     0,      0, 3, 1 },
     { "AESKEY",       0x00D5, 3, 0, 1 },
-    { "KDF",          0x00F9, 3, 0, 1 },
+    { "KDF",          0x00F9, 3, 4, 1 },
     { NULL, 0 }
   };
   int exmode;
@@ -2507,6 +2507,12 @@ do_setattr (app_t app, const char *name,
     app->force_chv1 = (valuelen && *value == 0);
   else if (table[idx].special == 2)
     parse_login_data (app);
+  else if (table[idx].special == 4)
+    {
+      app->did_chv1 = 0;
+      app->did_chv2 = 0;
+      app->did_chv3 = 0;
+    }
 
   return rc;
 }

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

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


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