From 7fd6016e1c3928d588e9bd7d787171f054674bd3 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 7 Dec 2010 14:24:40 +0000
Subject: Set DH Parameter for SSLContext to clean warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/openssl/test_pair.rb | 3 +++
 test/openssl/test_ssl.rb  | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'test/openssl')

diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 0f54e5b893..2d761385c5 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -10,11 +10,13 @@ require 'socket'
 require_relative '../ruby/ut_eof'
 
 module SSLPair
+  DHParam = OpenSSL::PKey::DH.new(128)
   def server
     host = "127.0.0.1"
     port = 0
     ctx = OpenSSL::SSL::SSLContext.new()
     ctx.ciphers = "ADH"
+    ctx.tmp_dh_callback = proc { DHParam }
     tcps = TCPServer.new(host, port)
     ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
     return ssls
@@ -194,6 +196,7 @@ class OpenSSL::TestPair < Test::Unit::TestCase
     port = 0
     ctx = OpenSSL::SSL::SSLContext.new()
     ctx.ciphers = "ADH"
+    ctx.tmp_dh_callback = proc { DHParam }
     serv = TCPServer.new(host, port)
 
     port = serv.connect_address.ip_port
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 01c8439b13..c8e42f43af 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -83,6 +83,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
   rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK
   end
 
+  DHParam = OpenSSL::PKey::DH.new(128)
   def start_server(port0, verify_mode, start_immediately, args = {}, &block)
     ctx_proc = args[:ctx_proc]
     server_proc = args[:server_proc]
@@ -96,6 +97,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
     #ctx.extra_chain_cert = [ ca_cert ]
     ctx.cert = @svr_cert
     ctx.key = @svr_key
+    ctx.tmp_dh_callback = proc { DHParam }
     ctx.verify_mode = verify_mode
     ctx_proc.call(ctx) if ctx_proc
 
-- 
cgit v1.2.3