From 7cebe8f28682fd23b3cca63509f8248657af5b4a Mon Sep 17 00:00:00 2001
From: joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>
Date: Wed, 2 Sep 2015 09:32:47 +0000
Subject: * test/makekeys.sh, test/openssl.conf: Use 2048-bit RSA keys
 throughout.

git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1961 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
---
 test/makekeys.sh  | 5 +++--
 test/openssl.conf | 3 +++
 test/server.key   | 9 ---------
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 test/server.key

diff --git a/test/makekeys.sh b/test/makekeys.sh
index c53a89d..747834e 100755
--- a/test/makekeys.sh
+++ b/test/makekeys.sh
@@ -28,10 +28,11 @@ for i in ca ca1 ca2 ca3; do
     mkdir $i
     touch $i/index.txt
     echo 01 > $i/serial
-    ${OPENSSL} genrsa -rand ${srcdir}/../configure 1024 > $i/key.pem
+    ${OPENSSL} genrsa -rand ${srcdir}/../configure 2048 > $i/key.pem
 done
 
-${OPENSSL} genrsa -rand ${srcdir}/../configure 1024 > client.key
+${OPENSSL} genrsa -rand ${srcdir}/../configure 2048 > client.key
+${OPENSSL} genrsa -rand ${srcdir}/../configure 2048 > server.key
 
 ${OPENSSL} dsaparam -genkey -rand ${srcdir}/../configure 1024 > client.dsap
 ${OPENSSL} gendsa client.dsap > clientdsa.key
diff --git a/test/openssl.conf b/test/openssl.conf
index 959c945..62aa43e 100644
--- a/test/openssl.conf
+++ b/test/openssl.conf
@@ -12,6 +12,7 @@ policy = policy_any
 default_md = sha1
 x509_extensions = issuedExt
 unique_subject = no
+default_bits = 2048
 
 # same as neonca1 just +basicConstraints and without certificate to
 # allow creation of the initial self signed certificate
@@ -26,6 +27,7 @@ default_md = sha1
 x509_extensions = issuedExt
 unique_subject = no
 basicConstraints = CA:TRUE
+default_bits = 2048
 
 [policy_any]
 countryName = optional
@@ -40,6 +42,7 @@ emailAddress = optional
 distinguished_name = $ENV::REQDN
 x509_extensions = caExt
 string_mask = $ENV::STRMASK
+default_bits = 2048
 
 [caExt]
 basicConstraints = CA:true
diff --git a/test/server.key b/test/server.key
deleted file mode 100644
index cdfb91b..0000000
--- a/test/server.key
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAPNFTmxnz4JZA+8+SonD0qWgSBPYWrNlH1FP+psm5EGZGmGJGvSD
-sk6HkyvstdopKF50UuEaJ263IorAhkmdGG0CAwEAAQJAJBhYdoVAqNqEVu8rKB3C
-F4kcqLUlYBDVAL+ZM4QlwgWncAKk2C53BwH4PVWIIfyysleyt3bTAtqg/tgMNM06
-AQIhAP1HKbuppa+UY4rNP4Xcyj5BrCU4wVz77sg/ygW+mWIhAiEA9eKcUnnaIpig
-hlWtx9qz++85/JtahA85j6T48v0hBM0CIQCa8ByUg2wq45CdSX+xiOZjfVMslfKb
-yjZBY9xW9UjpYQIgdy9j5JqKANEIpnTran95VLot2mMXagHTPeySe331PlUCIQD0
-rL1AXeIR3Vd4D8dgab/FVbg4i94qBiY0731nyPJRoQ==
------END RSA PRIVATE KEY-----
-- 
cgit v1.2.1