[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-21-g25f3b69

[by Arnaud Fontaine]

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  25f3b69129015c54392636818c8846e236f5cb2c (commit)
      from  0a3bec2c2525935362f87dce93d7df2c8d498498 (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 25f3b69129015c54392636818c8846e236f5cb2c
Author: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
Date:   Thu Feb 8 19:03:08 2018 +0100

    scd: Improve KDF-DO support
    
    * scd/app-openpgp.c (pin2hash_if_kdf): Check the content of KDF DO.
    
    --
    
    Length check added by gniibe.
    
    Signed-off-by: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 5b1b0d3..f3065ed 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2072,7 +2072,8 @@ pin2hash_if_kdf (app_t app, int chvno, char *pinvalue, int *r_pinlen)
   size_t buflen;
 
   if (app->app_local->extcap.kdf_do
-      && (relptr = get_one_do (app, 0x00F9, &buffer, &buflen, NULL)))
+      && (relptr = get_one_do (app, 0x00F9, &buffer, &buflen, NULL))
+      && buflen == 110 && (buffer[2] == 0x03))
     {
       char *salt;
       unsigned long s2k_count;

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

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


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