diff options
author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-28 20:03:32 +0000 |
---|---|---|
committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-28 20:03:32 +0000 |
commit | 9871dd5783963ad3d341ddb58f6bfe7ca7ceb444 (patch) | |
tree | f08e526f6291178d38b8e7efa5120854f57ab032 /test/openssl/test_pair.rb | |
parent | 9b9e6875e8a151a925fb92370c07f13c045c0a87 (diff) | |
download | ruby-9871dd5783963ad3d341ddb58f6bfe7ca7ceb444.tar.gz |
* test/openssl/utils.rb
test/openssl/test_pair.rb
test/openssl/test_pkey_dh.rb: Use 1024 bit DH parameters to satisfy
OpenSSL FIPS requirements. Patch by Vit Ondruch.
[Bug #6938] [ruby-core:47326]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/test_pair.rb')
-rw-r--r-- | test/openssl/test_pair.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index 940fa0c0db..12af6aeff5 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -6,13 +6,12 @@ require 'socket' require_relative '../ruby/ut_eof' module SSLPair - DHParam = OpenSSL::PKey::DH.new(128) def server host = "127.0.0.1" port = 0 ctx = OpenSSL::SSL::SSLContext.new() ctx.ciphers = "ADH" - ctx.tmp_dh_callback = proc { DHParam } + ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } tcps = TCPServer.new(host, port) ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx) return ssls @@ -192,7 +191,7 @@ class OpenSSL::TestPair < Test::Unit::TestCase port = 0 ctx = OpenSSL::SSL::SSLContext.new() ctx.ciphers = "ADH" - ctx.tmp_dh_callback = proc { DHParam } + ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } serv = TCPServer.new(host, port) port = serv.connect_address.ip_port |