diff options
| author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-13 05:59:53 +0000 |
|---|---|---|
| committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-13 05:59:53 +0000 |
| commit | 5bc61ceddec4f15b407b0fa8e435f816355d5506 (patch) | |
| tree | f315dcb6b7c9e2f31963e3b5bebc72f383bd42ce | |
| parent | 7b47638c37a17b3949b8f7e02b2e454b90001da7 (diff) | |
| download | ruby-5bc61ceddec4f15b407b0fa8e435f816355d5506.tar.gz | |
openssl: workaround for Ubuntu's patched OpenSSL
* test/openssl/test_ssl.rb (test_ctx_options): Add a workaround for
patched OpenSSL to fix the Ruby CI failure on Ubuntu 16.04.
http://rubyci.s3.amazonaws.com/ubuntu/ruby-trunk/log/20160913T033003Z.fail.html.gz
This commit is a cherry-pick of the following commit at ruby/openssl:
https://github.com/ruby/openssl/commit/f9c04779a84b45d85dc26dc19ea600d0613539e2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/openssl/test_ssl.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 0af93a8bc2..f7048c3f80 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -10,10 +10,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase assert (OpenSSL::SSL::OP_ALL & ctx.options) == OpenSSL::SSL::OP_ALL, "OP_ALL is set by default" - ctx.options = 4 - assert_equal 4, ctx.options ctx.options = nil assert_equal OpenSSL::SSL::OP_ALL, ctx.options + ctx.options = 4 + assert_equal 4, ctx.options & 4 + if ctx.options != 4 + pend "SSL_CTX_set_options() seems to be modified by distributor" + end assert_equal true, ctx.setup assert_predicate ctx, :frozen? |