naruse	2012-09-02 05:46:31 +0900 (Sun, 02 Sep 2012)

  New Revision: 36878

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36878

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/lib/webrick/ssl.rb
    trunk/test/net/http/utils.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36877)
+++ ChangeLog	(revision 36878)
@@ -1,3 +1,11 @@
+Sun Sep  2 05:41:28 2012  NARUSE, Yui  <naruse@r...>
+
+	* 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@i...>
 
 	* lib/set.rb (#initialize_copy, #eql): Use instance_variable_get
Index: lib/webrick/ssl.rb
===================================================================
--- lib/webrick/ssl.rb	(revision 36877)
+++ lib/webrick/ssl.rb	(revision 36878)
@@ -22,6 +22,7 @@
       :SSLCACertificateFile => nil,
       :SSLCACertificatePath => nil,
       :SSLCertificateStore  => nil,
+      :SSLTmpDhCallback     => nil.
       :SSLVerifyClient      => ::OpenSSL::SSL::VERIFY_NONE,
       :SSLVerifyDepth       => nil,
       :SSLVerifyCallback    => nil,   # custom verification
@@ -116,6 +117,7 @@
       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]
Index: test/net/http/utils.rb
===================================================================
--- test/net/http/utils.rb	(revision 36877)
+++ test/net/http/utils.rb	(revision 36878)
@@ -59,6 +59,7 @@
         :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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/