Permalink
Browse files

Failing openssl.patch for Ruby 1.9.3

Fixes #3831
  • Loading branch information...
1 parent 1a6bd41 commit f1fa4691146ec68785eeb095db8698ebca599601 @pkuczynski pkuczynski committed Jan 2, 2017
Showing with 2 additions and 14 deletions.
  1. +2 −1 CHANGELOG.md
  2. +0 −13 patches/ruby/1.9.3/openssl3.patch
View
@@ -12,7 +12,8 @@
#### Bug fixes:
* $PATH become empty after __rvm_unload executed [\#3847](https://github.com/rvm/rvm/pull/3847)
-* RVM incorrectly tries to install llvm 3.5 when trying to install Rubinius 3 [\#3848](https://github.com/rvm/rvm/pull/3848),
+* RVM incorrectly tries to install llvm 3.5 when trying to install Rubinius 3 [\#3848](https://github.com/rvm/rvm/pull/3848)
+* Failing openssl.patch for Ruby 1.9.3 [\#3831](https://github.com/rvm/rvm/issues/3831)
## [1.28.0](https://github.com/rvm/rvm/tag/1.28.0)
@@ -29,16 +29,3 @@ index f7cb7f0..47111f6 100644
OSSL_SSL_METHOD_ENTRY(SSLv23),
OSSL_SSL_METHOD_ENTRY(SSLv23_server),
OSSL_SSL_METHOD_ENTRY(SSLv23_client),
-diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
-index 07e081b..0cbfcba 100644
---- a/test/openssl/test_ssl.rb
-+++ b/test/openssl/test_ssl.rb
-@@ -912,7 +912,7 @@ def test_unset_OP_ALL
- # that has been marked as forbidden, therefore either of these may be raised
- HANDSHAKE_ERRORS = [OpenSSL::SSL::SSLError, Errno::ECONNRESET]
-
--if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1
-+if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1) && OpenSSL::SSL::SSLContext::METHODS.include?(:SSLv3)
-
- def test_forbid_ssl_v3_for_client
- ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3 }

0 comments on commit f1fa469

Please sign in to comment.