[git] GnuPG - branch, master, updated. gnupg-2.1.15-264-gacef095

[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  acef0951646b47c87ccc1c616f0105a068e7ed86 (commit)
      from  987bbb2276aeb6bee2793e8406e223717b605009 (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 acef0951646b47c87ccc1c616f0105a068e7ed86
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 24 07:52:40 2016 +0900

    g10: Fix card keygen for decryption.
    
    * g10/keygen.c (do_generate_keypair): Fix arguments.
    
    --
    
    Reported-by: Grumpy
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 61e070c..ed529c7 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4344,8 +4344,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
         }
       else
         {
-          err = gen_card_key (2, 0, get_parameter_algo (para, pSUBKEYTYPE, NULL),
-                              pub_root, &timestamp,
+          err = gen_card_key (2, get_parameter_algo (para, pSUBKEYTYPE, NULL),
+                              0, pub_root, &timestamp,
                               get_parameter_u32 (para, pKEYEXPIRE));
         }
 

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

Summary of changes:
 g10/keygen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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