[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-247-g244587e

[by Werner Koch]

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  244587ea41d4c75cb5570356f09a6705864a7e8d (commit)
       via  4c3b35b067a4e7002bb6473b879b551014bb7857 (commit)
      from  12990efb45ee7c425167aad19fe759d5609c5182 (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 244587ea41d4c75cb5570356f09a6705864a7e8d
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:28:26 2013 +0200

    scd: Suppress gcc warning about possible uninitialized use.
    
    * scd/app-nks.c (parse_pwidstr): Always init r_pwid.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/scd/app-nks.c b/scd/app-nks.c
index c83217f..19a33ed 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -1125,7 +1125,10 @@ parse_pwidstr (const char *pwidstr, int new_mode, int *r_sigg, int *r_pwid)
                   "for the key to create qualified signatures."));
     }
   else
-    desc = NULL;
+    {
+      *r_pwid = 0; /* Only to avoid gcc warning in calling function.  */
+      desc = NULL; /* Error.  */
+    }
 
   return desc;
 }

commit 4c3b35b067a4e7002bb6473b879b551014bb7857
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:27:21 2013 +0200

    gpg: Use 2048 as the default keysize in batch mode.
    
    * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
    2048.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 2017662..3b02f04 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1408,7 +1408,7 @@ gen_elg (int algo, unsigned int nbits, KBNODE pub_root,
 
   if (nbits < 512)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
 
@@ -1458,7 +1458,7 @@ gen_dsa (unsigned int nbits, KBNODE pub_root,
 
   if ( nbits < 512)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info(_("keysize invalid; using %u bits\n"), nbits );
     }
   else if ( nbits > 3072 )
@@ -1592,7 +1592,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
 
   if (nbits < 1024)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
 

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

Summary of changes:
 g10/keygen.c  |    6 +++---
 scd/app-nks.c |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)


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