From 15543bab14e7ed3c3d87c92195a531cfd1cc8884 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Sun, 26 Jul 2015 01:29:02 +0000 Subject: * ext/openssl/ossl_ssl.c (ossl_call_servername_cb): set the ssl context object returned by the servername callback on to the socket as an instance variable. If the callback allocated a new context object and didn't keep a reference to it, it could be GC'd out from under the socket object. * test/openssl/test_ssl.rb (class OpenSSL): test for change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_ssl.rb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'test/openssl/test_ssl.rb') diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 58ab76f412..d714b4010f 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -607,6 +607,39 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase cert end + def test_servername_cb_sets_context_on_the_socket + hostname = 'example.org' + + ctx3 = OpenSSL::SSL::SSLContext.new + ctx3.ciphers = "DH" + + ctx2 = OpenSSL::SSL::SSLContext.new + ctx2.ciphers = "DH" + ctx2.servername_cb = lambda { |args| ctx3 } + + sock1, sock2 = UNIXSocket.pair + + s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2) + + ctx1 = OpenSSL::SSL::SSLContext.new + ctx1.ciphers = "DH" + + s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1) + s1.hostname = hostname + t = Thread.new { s1.connect } + + assert_equal ctx2, s2.context + accepted = s2.accept + assert_equal ctx3, s2.context + assert t.value + ensure + s1.close if s1 + s2.close if s2 + sock1.close if sock1 + sock2.close if sock2 + accepted.close if accepted.respond_to?(:close) + end + def test_servername_cb_raises_an_exception_on_unknown_objects hostname = 'example.org' -- cgit v1.2.3