diff options
| author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-29 15:48:46 +0000 |
|---|---|---|
| committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-29 15:48:46 +0000 |
| commit | 0cc0080a49bc59cbe7dee7f53c337935fe169995 () | |
| tree | c64518b4fe61cfa9b12300d09e000c7969072f8e | |
| parent | df769d9dc96e14e2211b7526a3f3e242137581fc (diff) | |
open-uri: don't use OpenSSL::TestUtils from open-uri tests
Follow net/http. Define own test DH parameters and use. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/open-uri/test_ssl.rb | 39 |
1 files changed, 35 insertions, 4 deletions
@@ -6,7 +6,6 @@ require 'webrick' begin require 'openssl' require 'webrick/https' - require_relative '../openssl/utils' rescue LoadError end require 'webrick/httpproxy' @@ -31,7 +30,7 @@ class TestOpenURISSL :SSLEnable => true, :SSLCertificate => OpenSSL::X509::Certificate.new(SERVER_CERT), :SSLPrivateKey => OpenSSL::PKey::RSA.new(SERVER_KEY), - :SSLTmpDhCallback => proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }, :BindAddress => '127.0.0.1', :Port => 0}) _, port, _, host = srv.listeners[0].addr @@ -173,9 +172,9 @@ class TestOpenURISSL } end -end if defined?(OpenSSL::TestUtils) -if defined?(OpenSSL::TestUtils) # cp /etc/ssl/openssl.cnf . # I copied from OpenSSL 1.0.2h source # mkdir demoCA demoCA/private demoCA/newcerts @@ -386,4 +385,36 @@ P0ZCl31aopNsBcKLiy2v1X116XDwLSHjuc9NmsSX4nk= -----END RSA PRIVATE KEY----- End end |