diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-19 14:59:58 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-19 14:59:58 +0000 |
| commit | 036fe23b268d2d286b06b2bfc7cea1548d980d6b (patch) | |
| tree | cbe2f660b7486f49e8a0133d546956b914f480a3 /test/openssl/test_ssl.rb | |
| parent | c670b75ec2bf47ddb901867d2add7cc2ad675f4e (diff) | |
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): add OP_ALL to
existing options rather than just setting it. Some vendors apply
custom patches to their versions of OpenSSL that set default values
for options. This commit respects the custom patches they've
applied.
* test/openssl/test_ssl.rb (class OpenSSL): check that OP_ALL has been
added to the options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/test_ssl.rb')
| -rw-r--r-- | test/openssl/test_ssl.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 55dc518aa6..07e081b352 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -20,9 +20,9 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase } end - def test_options_defaults_to_OP_ALL + def test_options_defaults_to_OP_ALL_on ctx = OpenSSL::SSL::SSLContext.new - assert_equal OpenSSL::SSL::OP_ALL, ctx.options + assert_equal(OpenSSL::SSL::OP_ALL, (OpenSSL::SSL::OP_ALL & ctx.options)) end def test_setting_twice |