diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/webrick/ssl.rb | 2 | ||||
| -rw-r--r-- | test/net/http/utils.rb | 1 |
3 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Sun Sep 2 05:41:28 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/webrick/ssl.rb (WEBrick::Config::SSL): add new key + SSLTmpDhCallback to set SSLContext#tmp_dh_calback. + + * lib/webrick/ssl.rb (WEBrick::GenericServer#setup_ssl_context): + follow above. + Sat Sep 1 18:50:50 2012 Akinori MUSHA <knu@iDaemons.org> * lib/set.rb (#initialize_copy, #eql): Use instance_variable_get diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb index b3cc7aaf01..a1d2cde59c 100644 --- a/lib/webrick/ssl.rb +++ b/lib/webrick/ssl.rb @@ -22,6 +22,7 @@ module WEBrick :SSLCACertificateFile => nil, :SSLCACertificatePath => nil, :SSLCertificateStore => nil, + :SSLTmpDhCallback => nil. :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE, :SSLVerifyDepth => nil, :SSLVerifyCallback => nil, # custom verification @@ -116,6 +117,7 @@ module WEBrick ctx.ca_file = config[:SSLCACertificateFile] ctx.ca_path = config[:SSLCACertificatePath] ctx.cert_store = config[:SSLCertificateStore] + ctx.tmp_dh_callback = config[:SSLTmpDhCallback] ctx.verify_mode = config[:SSLVerifyClient] ctx.verify_depth = config[:SSLVerifyDepth] ctx.verify_callback = config[:SSLVerifyCallback] diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb index 9bea8f5474..02e99d45fb 100644 --- a/test/net/http/utils.rb +++ b/test/net/http/utils.rb @@ -59,6 +59,7 @@ module TestNetHTTPUtils :SSLEnable => true, :SSLCertificate => config('ssl_certificate'), :SSLPrivateKey => config('ssl_private_key'), + :SSLTmpDhCallback => proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }, }) end @server = WEBrick::HTTPServer.new(server_config) |