зеркало из https://github.com/github/ruby.git
* test/openssl/ssl_server.rb: Unused file removed.
It is not used since r16111, Ruby 1.9.1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
07da5b294a
Коммит
1e502d2a10
|
@ -1,3 +1,8 @@
|
|||
Thu Nov 13 21:22:35 2014 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* test/openssl/ssl_server.rb: Unused file removed.
|
||||
It is not used since r16111, Ruby 1.9.1.
|
||||
|
||||
Thu Nov 13 18:50:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_ensure): remove obsolete prot_tag comment. patch by
|
||||
|
|
|
@ -1,81 +0,0 @@
|
|||
require "socket"
|
||||
require "thread"
|
||||
require "openssl"
|
||||
require File.join(File.dirname(__FILE__), "utils.rb")
|
||||
|
||||
def get_pem(io=$stdin)
|
||||
buf = ""
|
||||
while line = io.gets
|
||||
if /^-----BEGIN / =~ line
|
||||
buf << line
|
||||
break
|
||||
end
|
||||
end
|
||||
while line = io.gets
|
||||
buf << line
|
||||
if /^-----END / =~ line
|
||||
break
|
||||
end
|
||||
end
|
||||
return buf
|
||||
end
|
||||
|
||||
def make_key(pem)
|
||||
begin
|
||||
return OpenSSL::PKey::RSA.new(pem)
|
||||
rescue
|
||||
return OpenSSL::PKey::DSA.new(pem)
|
||||
end
|
||||
end
|
||||
|
||||
ca_cert = OpenSSL::X509::Certificate.new(get_pem)
|
||||
ssl_cert = OpenSSL::X509::Certificate.new(get_pem)
|
||||
ssl_key = make_key(get_pem)
|
||||
port = Integer(ARGV.shift)
|
||||
verify_mode = Integer(ARGV.shift)
|
||||
start_immediately = (/yes/ =~ ARGV.shift)
|
||||
|
||||
store = OpenSSL::X509::Store.new
|
||||
store.add_cert(ca_cert)
|
||||
store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
|
||||
ctx = OpenSSL::SSL::SSLContext.new
|
||||
ctx.cert_store = store
|
||||
#ctx.extra_chain_cert = [ ca_cert ]
|
||||
ctx.cert = ssl_cert
|
||||
ctx.key = ssl_key
|
||||
ctx.verify_mode = verify_mode
|
||||
|
||||
Socket.do_not_reverse_lookup = true
|
||||
tcps = nil
|
||||
100.times{|i|
|
||||
begin
|
||||
tcps = TCPServer.new("0.0.0.0", port+i)
|
||||
port = port + i
|
||||
break
|
||||
rescue Errno::EADDRINUSE
|
||||
next
|
||||
end
|
||||
}
|
||||
ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
|
||||
ssls.start_immediately = start_immediately
|
||||
|
||||
$stdout.sync = true
|
||||
$stdout.puts Process.pid
|
||||
$stdout.puts port
|
||||
|
||||
loop do
|
||||
ssl = ssls.accept rescue next
|
||||
Thread.start{
|
||||
q = Queue.new
|
||||
th = Thread.start{ ssl.write(q.shift) while true }
|
||||
while line = ssl.gets
|
||||
if line =~ /^STARTTLS$/
|
||||
ssl.accept
|
||||
next
|
||||
end
|
||||
q.push(line)
|
||||
end
|
||||
th.kill if q.empty?
|
||||
ssl.close
|
||||
}
|
||||
end
|
|
@ -190,7 +190,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
|
|||
|
||||
class OpenSSL::SSLTestCase < Test::Unit::TestCase
|
||||
RUBY = EnvUtil.rubybin
|
||||
SSL_SERVER = File.join(File.dirname(__FILE__), "ssl_server.rb")
|
||||
PORT = 20443
|
||||
ITERATIONS = ($0 == __FILE__) ? 100 : 10
|
||||
|
||||
|
@ -311,7 +310,7 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
|
|||
end
|
||||
threads.unshift server
|
||||
|
||||
$stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, $$, port) if $DEBUG
|
||||
$stderr.printf("SSL server started: pid=%d port=%d\n", $$, port) if $DEBUG
|
||||
|
||||
client = Thread.new do
|
||||
begin
|
||||
|
|
Загрузка…
Ссылка в новой задаче