rhe	2017-09-12 22:52:51 +0900 (Tue, 12 Sep 2017)

  New Revision: 59857

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59857

  Log:
    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

  Modified files:
    trunk/test/openssl/test_pair.rb
    trunk/test/openssl/test_ssl.rb
Index: test/openssl/test_pair.rb
===================================================================
--- test/openssl/test_pair.rb	(revision 59856)
+++ test/openssl/test_pair.rb	(revision 59857)
@@ -24,6 +24,7 @@ module OpenSSL::SSLPairM https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pair.rb#L24
       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
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 59856)
+++ test/openssl/test_ssl.rb	(revision 59857)
@@ -1015,6 +1015,7 @@ if openssl?(1, 0, 2) || libressl? https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L1015
     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)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/