[git] GnuPG - branch, master, updated. gnupg-2.1.6-2-g45c49a0

[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  45c49a0030c7a01ec011ce810ddb3aaef734e9bf (commit)
      from  279381b59e35e530ffa0f2b7b3a88e6c9216f5ec (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 45c49a0030c7a01ec011ce810ddb3aaef734e9bf
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jul 2 12:14:40 2015 +0900

    scd: Support AES decryption for OpenPGPcard v3.0.
    
    * scd/app-openpgp.c (do_decipher): Support AES decryption.

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 467389d..f5911f3 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -4101,7 +4101,10 @@ do_decipher (app_t app, const char *keyidstr,
   if (rc)
     return rc;
 
-  if (app->app_local->keyattr[1].key_type == KEY_TYPE_RSA)
+  if (indatalen == 16 + 1 || indatalen == 32 + 1)
+    /* PSO:DECIPHER with symmetric key.  */
+    padind = -1;
+  else if (app->app_local->keyattr[1].key_type == KEY_TYPE_RSA)
     {
       /* We might encounter a couple of leading zeroes in the
          cryptogram.  Due to internal use of MPIs these leading zeroes

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

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