summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-02 12:50:02 +0000
committeremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-02 12:50:02 +0000
commit5aa3caaa5d68d6e62612574869f1dc6293ebb836 (patch)
treebeb47b57327ea9354c78c98271ef58dc62f4dc6e
parent2c1939f458816d4d72187e7a1cee0add05f0ca53 (diff)
* test/openssl/utils.rb: Use a cached DH key instead of generating a
new one each time. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/openssl/utils.rb9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 202ea60f53..4c2d4e900f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 2 21:46:28 2012 BOSSLET, Martin <Martin.Bosslet@googlemail.com>
+
+ * test/openssl/utils.rb: Use a cached DH key instead of generating a
+ new one each time.
+
Sun Sep 2 05:41:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/webrick/ssl.rb (WEBrick::Config::SSL): add new key
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index aa42ef0d34..f95179636c 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -99,8 +99,15 @@ aPgwHyJBiK1/ebK3tYcrSKrOoRyrAgEC
-----END DH PARAMETERS-----
_end_of_pem_
+ TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
+pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
+AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
+-----END DH PARAMETERS-----
+ _end_of_pem_
- TEST_KEY_DH1024 = OpenSSL::PKey::DH.new(1024)
+ TEST_KEY_DH1024.priv_key = OpenSSL::BN.new("48561834C67E65FFD2A9B47F41E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB451E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672EEF3EF13AB47A15275FC2836F3AC74CEA", 16)
module_function