diff options
| author | Zachary Scott <e@zzak.io> | 2015-09-23 09:26:00 -0400 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2015-09-23 09:26:00 -0400 |
| commit | 03c088b936c1bea55687c6345799b28b98c24ee9 (patch) | |
| tree | 8b2e7b7ecc54576ecf321717240429c5f168fb40 /test/test_ssl_session.rb | |
| parent | 4df76773f42ddedf8e0907615a43b144f63f3a83 (diff) | |
| download | ruby-openssl-03c088b936c1bea55687c6345799b28b98c24ee9.tar.gz | |
Sync with ruby trunk
Diffstat (limited to 'test/test_ssl_session.rb')
| -rw-r--r-- | test/test_ssl_session.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/test_ssl_session.rb b/test/test_ssl_session.rb index 16432bcb..28d268e7 100644 --- a/test/test_ssl_session.rb +++ b/test/test_ssl_session.rb @@ -44,7 +44,7 @@ tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM= end def test_session - timeout(5) do + Timeout.timeout(5) do start_server(OpenSSL::SSL::VERIFY_NONE, true) do |server, port| sock = TCPSocket.new("127.0.0.1", port) ctx = OpenSSL::SSL::SSLContext.new("TLSv1") @@ -316,6 +316,7 @@ __EOS__ ctx_proc = Proc.new { |ctx, ssl| ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER + ctx.options = OpenSSL::SSL::OP_NO_TICKET last_server_session = nil # get_cb is called whenever a client proposed to resume a session but @@ -355,13 +356,13 @@ __EOS__ 3.times do sock = TCPSocket.new("127.0.0.1", port) begin - ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new("SSLv3")) + ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new()) ssl.sync_close = true ssl.session = last_client_session if last_client_session ssl.connect last_client_session = ssl.session ssl.close - timeout(5) do + Timeout.timeout(5) do Thread.pass until called.key?(:new) assert(called.delete(:new)) Thread.pass until called.key?(:remove) |