diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/openssl/ssl_server.rb | 81 | ||||
| -rw-r--r-- | test/openssl/utils.rb | 3 |
3 files changed, 6 insertions, 83 deletions
@@ -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 diff --git a/test/openssl/ssl_server.rb b/test/openssl/ssl_server.rb deleted file mode 100644 index d3ad55d236..0000000000 --- a/test/openssl/ssl_server.rb +++ /dev/null @@ -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 diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index 02bf968737..4b10c1cfa9 100644 --- a/test/openssl/utils.rb +++ b/test/openssl/utils.rb @@ -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 |