Merge branch 'maint'

This also restores 'if defined?(OpenSSL)-end' wrapping the test code.
They have been removed erroneously by commit 4eb4b3297a92 ("Remove
support for OpenSSL 0.9.8 and 1.0.0", 2016-11-30).

* maint:
  test/test_ssl: explicitly accept TLS 1.1 in corresponding test
  ssl: remove useless call to rb_thread_wait_fd()
  test/test_pair, test/test_ssl: fix for TLS 1.3
  test/test_ssl_session: rearrange tests
  test/test_ssl: move test_multibyte_read_write to test_pair
  test/test_ssl: remove test_invalid_shutdown_by_gc
  test/utils: do not use DSA certificates in SSL tests
  test/utils: add OpenSSL::TestUtils.openssl? and .libressl?
  test/utils: improve error handling in start_server
  test/utils: let server_loop close socket
  test/utils: do not set ecdh_curves in start_server
  test/utils: have start_server yield only the port number
  test/utils: add SSLTestCase#tls12_supported?
  test/utils: remove OpenSSL::TestUtils.silent
  test: fix formatting
  Rakefile: let sync:to_ruby know about test/openssl/fixtures
  cipher: update the documentation for Cipher#auth_tag=
  Backport "Merge branch 'topic/test-memory-leak'" to maint
  ssl: do not call session_remove_cb during GC

1 files changed, 5 insertions, 1 deletions

diff --git a/test/test_x509store.rb b/test/test_x509store.rb
index 0009813d..6412249b 100644
--- a/test/test_x509store.rb
+++ b/test/test_x509store.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: false
 require_relative "utils"
 
+if defined?(OpenSSL)
+
 class OpenSSL::TestX509Store < OpenSSL::TestCase
   def setup
     super
@@ -207,7 +209,7 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
   end
 
   def test_set_errors
-    return if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000
+    return if openssl?(1, 1, 0) || libressl?
     now = Time.now
     ca1_cert = issue_cert(@ca1, @rsa2048, 1, [], nil, nil)
     store = OpenSSL::X509::Store.new
@@ -235,3 +237,5 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
     assert_raise(NoMethodError) { ctx.dup }
   end
 end
+
+end