From 5741eace292f429c61e32d76db3595104b24a045 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 10 Nov 2009 16:35:59 +0000
Subject: [PATCH] Change fallback keysize to 2048

---
 sm/ChangeLog    | 3 +++
 sm/certreqgen.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sm/ChangeLog b/sm/ChangeLog
index 87abd0a35..40a5eb3c5 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -10,6 +10,9 @@
 
 2009-11-04  Werner Koch  <wk@g10code.com>
 
+	* certreqgen.c (proc_parameters): Change fallback key length to
+	2048.
+
 	* server.c (register_commands): Add help arg to
 	assuan_register_command.  Provide help strings for all commands.
 
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 59e667981..49b2b9208 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -61,7 +61,7 @@ The format of the native parameter file is follows:
 	This is a required parameter.  For now the only supported
         algorithm is "rsa".
      Key-Length: <length-in-bits>
-	Length of the key in bits.  Default is 1024.
+	Length of the key in bits.  Default is 2048.
      Key-Grip: hexstring
         This is optional and used to generate a request for an already
         existing key.  Key-Length will be ignored when given,
@@ -83,7 +83,7 @@ Here is an example:
 $ cat >foo <<EOF
 %echo Generating a standard key
 Key-Type: RSA
-Key-Length: 1024
+Key-Length: 2048
 Name-DN: CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE
 Name-Email: joe@foo.bar
 # Do a commit here, so that we can later print "done" :-)
@@ -477,7 +477,7 @@ proc_parameters (ctrl_t ctrl,
   
   /* Check the keylength. */
   if (!get_parameter (para, pKEYLENGTH, 0))
-    nbits = 1024;
+    nbits = 2048;
   else
     nbits = get_parameter_uint (para, pKEYLENGTH);
   if ((nbits < 1024 || nbits > 4096) && !cardkeyid)