kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Set DH Parameter for SSLContext to clean warnings.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-12-07 14:24:40 +00:00
parent 9865ee2c46
commit 7fd6016e1c
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/openssl/test_pair.rb
View file

@ -10,11 +10,13 @@ require 'socket'
require_relative '../ruby/ut_eof' require_relative '../ruby/ut_eof'
module SSLPair module SSLPair
DHParam = OpenSSL::PKey::DH.new(128)
def server def server
host = "127.0.0.1" host = "127.0.0.1"
port = 0 port = 0
ctx = OpenSSL::SSL::SSLContext.new() ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH" ctx.ciphers = "ADH"
ctx.tmp_dh_callback = proc { DHParam }
tcps = TCPServer.new(host, port) tcps = TCPServer.new(host, port)
ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx) ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
return ssls return ssls
@ -194,6 +196,7 @@ class OpenSSL::TestPair < Test::Unit::TestCase
port = 0 port = 0
ctx = OpenSSL::SSL::SSLContext.new() ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH" ctx.ciphers = "ADH"
ctx.tmp_dh_callback = proc { DHParam }
serv = TCPServer.new(host, port) serv = TCPServer.new(host, port)
port = serv.connect_address.ip_port port = serv.connect_address.ip_port

2
test/openssl/test_ssl.rb
View file

@ -83,6 +83,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK
end end
DHParam = OpenSSL::PKey::DH.new(128)
def start_server(port0, verify_mode, start_immediately, args = {}, &block) def start_server(port0, verify_mode, start_immediately, args = {}, &block)
ctx_proc = args[:ctx_proc] ctx_proc = args[:ctx_proc]
server_proc = args[:server_proc] server_proc = args[:server_proc]
@ -96,6 +97,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
#ctx.extra_chain_cert = [ ca_cert ] #ctx.extra_chain_cert = [ ca_cert ]
ctx.cert = @svr_cert ctx.cert = @svr_cert
ctx.key = @svr_key ctx.key = @svr_key
ctx.tmp_dh_callback = proc { DHParam }
ctx.verify_mode = verify_mode ctx.verify_mode = verify_mode
ctx_proc.call(ctx) if ctx_proc ctx_proc.call(ctx) if ctx_proc