aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml13
-rw-r--r--test/openssl/test_ssl.rb4
2 files changed, 4 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index a4fae0f2..4447352f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,23 +12,10 @@ script:
matrix:
fast_finish: true
include:
- - env: RUBY_VERSION=ruby-2.3 OPENSSL_VERSION=openssl-1.0.2
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.2
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.1
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.2
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.0
- - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.5
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.6
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.7
- - language: ruby
- rvm: ruby-head
- before_install:
- - "rake install_dependencies"
- script:
- - "rake compile -- --enable-debug"
- - "rake test"
- allow_failures:
- - language: ruby
- rvm: ruby-head
- - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index eb5b77be..eae369a1 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1419,6 +1419,10 @@ end
end
def test_fallback_scsv
+ supported = check_supported_protocol_versions
+ return unless supported.include?(OpenSSL::SSL::TLS1_1_VERSION) &&
+ supported.include?(OpenSSL::SSL::TLS1_2_VERSION)
+
pend "Fallback SCSV is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv)