aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-09-08 23:08:50 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-09-09 03:58:28 +0000
commit4fec2e57f323dcbf6cc0e37c6a81907b52b1d851 (patch)
tree6811a22adec069d2d6c920d6513e5c99a30b8392
parent2d9509646b83ffd980a8fadfbc986b6b47b38f37 (diff)
downloadruby-4fec2e57f323dcbf6cc0e37c6a81907b52b1d851.tar.gz
openssl: merge test fixes from upstream, part 2
This is a combined patch of the following two commits: a09d8c78dd30 test/test_ssl: suppress warning in test_alpn_protocol_selection_cancel de965374ee85 test/test_pair: disable compression This hopefully fixes the RubyCI Gentoo failure: http://rubyci.s3.amazonaws.com/gentoo/ruby-trunk/log/20170908T093001Z.fail.html.gz
-rw-r--r--test/openssl/test_pair.rb1
-rw-r--r--test/openssl/test_ssl.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index f22183446f..0d9ad0b8d0 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -24,6 +24,7 @@ module OpenSSL::SSLPairM
sctx.cert = @svr_cert
sctx.key = @svr_key
sctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
+ sctx.options |= OpenSSL::SSL::OP_NO_COMPRESSION
ssls = OpenSSL::SSL::SSLServer.new(tcps, sctx)
ns = ssls.accept
ssls.close
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 3f17ab0d38..d60f031b99 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1015,6 +1015,7 @@ if openssl?(1, 0, 2) || libressl?
ctx1 = OpenSSL::SSL::SSLContext.new
ctx1.cert = @svr_cert
ctx1.key = @svr_key
+ ctx1.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
ctx1.alpn_select_cb = -> (protocols) { nil }
ssl1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)