diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-01 20:46:31 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-01 20:46:31 +0000 |
commit | 8e9bbfd513899c285b6c6edaedc1216e39d6976d (patch) | |
tree | 03b316caa8abef06f18eb076897ffbc49aac0752 /lib/webrick | |
parent | b238b5be91433f824d92da976a94c84451a91023 (diff) | |
download | ruby-8e9bbfd513899c285b6c6edaedc1216e39d6976d.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
-rw-r--r-- | lib/webrick/ssl.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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] |