diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2017-11-26 19:27:25 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-11-26 19:27:25 +0900 |
commit | 2475d94517b46b584b1ffc500865ca00c66d6ab6 (patch) | |
tree | ac05db1de25e41e8249a0af40f4cdf4e30f2ed1c | |
parent | 70aad19e83f619616967df7cb91c0e01e4d72c17 (diff) | |
parent | 01445af367ec9fd12a96c56e31f3b6aa68678a28 (diff) | |
download | ruby-openssl-2475d94517b46b584b1ffc500865ca00c66d6ab6.tar.gz |
Merge branch 'ky/fix-ssl-test-internal-encoding'
* ky/fix-ssl-test-internal-encoding:
test/test_ssl: prevent changing default internal encoding
-rw-r--r-- | test/test_ssl.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/test/test_ssl.rb b/test/test_ssl.rb index b3f3143f..1f7f6a39 100644 --- a/test/test_ssl.rb +++ b/test/test_ssl.rb @@ -1304,7 +1304,8 @@ end end def test_fallback_scsv - pend "Fallback SCSV is not supported" unless OpenSSL::SSL::SSLContext.method_defined?( :enable_fallback_scsv) + pend "Fallback SCSV is not supported" unless \ + OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv) start_server do |port| ctx = OpenSSL::SSL::SSLContext.new @@ -1339,17 +1340,13 @@ end ctx2.enable_fallback_scsv ctx2.max_version = OpenSSL::SSL::TLS1_1_VERSION s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2) - t = Thread.new { - assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) { - s2.connect - } - } - + t = Thread.new { s2.connect } assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) { s1.accept } - - assert t.join + assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) { + t.join + } ensure sock1.close sock2.close |