summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-12 13:52:51 +0000
committerrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-12 13:52:51 +0000
commitd0cdb26c75bb87e411bfa854279cc9db3561b9ec (patch)
tree017f5857d5abb7c8cbca352698ab8729d72d6590
parent672848de471ff160c37a91de3c9d114a359613b9 (diff)
openssl: merge test fixes from upstream, part 2
This is a combined patch of the following two commits in maint: 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/20170912T033004Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 f221834..0d9ad0b 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 3f17ab0..d60f031 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)