[DRE-commits] [ruby-openssl] 03/03: fix tests against OpenSSL with TLS < 1.2 disabled by default

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-openssl.

commit beb547c27224b09dbcd3022d2fc3462a43eb7384
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 25 16:34:15 2017 -0300

    fix tests against OpenSSL with TLS < 1.2 disabled by default
---
 debian/changelog                                   |  2 ++
 ...sl-explicitly-accept-TLS-1.1-in-correspon.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 53b5218..d3b5d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-openssl (2.0.5-1) unstable; urgency=medium
 
   * New upstream version 2.0.5
+  * Add patch to make tests work against OpenSSL with TLS < 1.2 disabled by
+    default. See https://github.com/ruby/openssl/pull/140
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 25 Aug 2017 14:39:14 -0300
 
diff --git a/debian/patches/0001-test-test_ssl-explicitly-accept-TLS-1.1-in-correspon.patch b/debian/patches/0001-test-test_ssl-explicitly-accept-TLS-1.1-in-correspon.patch
new file mode 100644
index 0000000..780bbaa
--- /dev/null
+++ b/debian/patches/0001-test-test_ssl-explicitly-accept-TLS-1.1-in-correspon.patch
@@ -0,0 +1,25 @@
+From: Antonio Terceiro <terceiro at softwarelivre.org>
+Date: Fri, 25 Aug 2017 16:21:44 -0300
+Subject: test/test_ssl: explicitly accept TLS 1.1 in corresponding test
+
+OpenSSL in Debian sid has recently disabled TLS < 1.2 by default, so in
+order to test that TLS 1.1 works, we need to explicitly make our test
+client accept it.
+---
+ test/test_ssl.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_ssl.rb b/test/test_ssl.rb
+index 8c65df9..77dddf5 100644
+--- a/test/test_ssl.rb
++++ b/test/test_ssl.rb
+@@ -814,7 +814,8 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_1) && OpenSSL::SSL::SSLCont
+ 
+   def test_tls_v1_1
+     start_server_version(:TLSv1_1) { |server, port|
+-      server_connect(port) { |ssl| assert_equal("TLSv1.1", ssl.ssl_version) }
++      ctx = OpenSSL::SSL::SSLContext.new(:TLSv1_1)
++      server_connect(port, ctx) { |ssl| assert_equal("TLSv1.1", ssl.ssl_version) }
+     }
+   end
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41265a0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-test-test_ssl-explicitly-accept-TLS-1.1-in-correspon.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-openssl.git