diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-20 08:05:08 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-20 08:05:08 +0000 |
| commit | 025a2479ae6bc2896e78594a49acd64c32415166 (patch) | |
| tree | a3c832ec4c9be9adc20b28292f80fae87cda76ff /lib/drb | |
| parent | 796700aca712dbd1155760b22cb50cfd8aab70d9 (diff) | |
* lib/drb/ssl.rb (DRb::DRbSSLSocket::SSLConfig::DEFAULT): add
SSLTmpDhCallback for configuration option.
* lib/drb/ssl.rb (setup_ssl_context): copy the value of tmp_dh_callback.
* test/drb/ut_array_drbssl.rb: set tmp_dh_callback to suppress warning.
* test/drb/ut_drb_drbssl.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/drb')
| -rw-r--r-- | lib/drb/ssl.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb index 2b6a2376ef..c4f76987de 100644 --- a/lib/drb/ssl.rb +++ b/lib/drb/ssl.rb @@ -15,6 +15,7 @@ module DRb :SSLClientCA => nil, :SSLCACertificatePath => nil, :SSLCACertificateFile => nil, + :SSLTmpDhCallback => nil, :SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE, :SSLVerifyDepth => nil, :SSLVerifyCallback => nil, # custom verification @@ -101,6 +102,7 @@ module DRb ctx.client_ca = self[:SSLClientCA] ctx.ca_path = self[:SSLCACertificatePath] ctx.ca_file = self[:SSLCACertificateFile] + ctx.tmp_dh_callback = self[:SSLTmpDhCallback] ctx.verify_mode = self[:SSLVerifyMode] ctx.verify_depth = self[:SSLVerifyDepth] ctx.verify_callback = self[:SSLVerifyCallback] |