[前][次][番号順一覧][スレッド一覧]

ruby-changes:60100

From: Yusuke <ko1@a...>
Date: Mon, 17 Feb 2020 13:22:07 +0900 (JST)
Subject: [ruby-changes:60100] 3fbcdac3e4 (master): test/openssl/test_ssl.rb: skip OpenSSL::TestSSL#test_fallback_scsv

https://git.ruby-lang.org/ruby.git/commit/?id=3fbcdac3e4

From 3fbcdac3e40f68667a9a1b5a2efed215762260c0 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Mon, 17 Feb 2020 13:20:51 +0900
Subject: test/openssl/test_ssl.rb: skip OpenSSL::TestSSL#test_fallback_scsv

on OpenSSL 1.1.1d or later.

https://github.com/ruby/openssl/issues/336

diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 4ce677f..c938ec4 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -186,9 +186,10 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L186
   end
 
   def test_add_certificate_chain_file
+    pend "The current server.crt seems too short for OpenSSL 1.1.1d or later" if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101040
     ctx = OpenSSL::SSL::SSLContext.new
     assert ctx.add_certificate_chain_file(Fixtures.file_path("chain", "server.crt"))
-  end if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10101040 # XXX: The current server.crt seems too short for OpenSSL 1.1.1d or later
+  end
 
   def test_sysread_and_syswrite
     start_server { |port|
@@ -1421,6 +1422,7 @@ end https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L1422
   def test_fallback_scsv
     pend "Fallback SCSV is not supported" unless \
       OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv)
+    pend "This test seems to fail on OpenSSL 1.1.1d or later" if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101040
 
     start_server do |port|
       ctx = OpenSSL::SSL::SSLContext.new
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]