From c9e79dd4a66530bdedb51519344706e2f5e996d6 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Wed, 22 Jan 2014 16:39:08 +0000
Subject: [PATCH] genkey: further tweaks to wording around key sizes

Resolves: rhbz#986788
---
 crypto-utils.spec |  5 ++++-
 genkey.pl         | 16 +++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/crypto-utils.spec b/crypto-utils.spec
index 0cf2874..041006f 100644
--- a/crypto-utils.spec
+++ b/crypto-utils.spec
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 45%{?dist}
+Release: 46%{?dist}
 Group: Applications/System
 # certwatch.c is GPLv2
 # pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+)
@@ -135,6 +135,9 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Wed Jan 22 2014 Joe Orton <jorton@redhat.com> - 2.4.1-46
+- genkey: further tweaks to wording around key sizes
+
 * Wed Jan 22 2014 Joe Orton <jorton@redhat.com> - 2.4.1-45
 - keyutil: use SHA1 as default hash in created certs (#921117)
 - genkey: default to 2048 bit keysize (#986788)
diff --git a/genkey.pl b/genkey.pl
index 909f5d1..a5a2b45 100644
--- a/genkey.pl
+++ b/genkey.pl
@@ -517,18 +517,17 @@ sub getkeysizeWindow()
     my $title= <<EOT;
 Choose the size of your key. The smaller the key you choose the faster
 your server response will be, but you'll have less security. Keys of
-less than 1024 bits are easily cracked.  Keys greater than 1024 bits
-don't work with all currently available browsers. 
+less than 1024 bits are easily cracked.
 
-We suggest you select the default, 1024 bits
+We suggest you select the default, 2048 bits.
 EOT
     my $panel = Newt::Panel(1, 3, "Choose key size");
     my $listbox = Newt::Listbox(5, 0);
     my $text = Newt::Textbox(70, 6, 0, $title);
     my @listitems = ("512 (insecure)",
-		     "1024 (medium-grade, fast speed)",
-		     "2048 (high-security, medium speed) [RECOMMENDED]",
-		     "4096 (paranoid-security, tortoise speed)",
+		     "1024 (low-grade, fast speed)",
+		     "2048 (medium-security, medium speed) [RECOMMENDED]",
+		     "4096 (high-security, slow speed)",
 		     "Choose your own");
 
     $listbox->Append(@listitems);
@@ -573,9 +572,8 @@ sub customKeySizeWindow()
 
     $title = <<EOT;
 Select the exact key size you want to use. Note that some browsers do
-not work correctly with arbitrary key sizes. For maximum compatibility
-you should use 512 or 1024, and for a reasonable level of security you
-should use 1024.
+not work correctly with arbitrary key sizes.  For a reasonable level
+of security you should use 2048.
 EOT
 
     $panel = Newt::Panel(1, 3, "Select exact key size");