Attachment 876385 Details for Bug 1078301 – Upstream fix

[patch] Upstream fix

0001-1.73-fixes-to-t-dhe.t-to-support-more-openssl-versio.patch (text/plain), 1.97 KB, created by Petr Pisar on 2014-03-19 14:55:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2014-03-19 14:55:23 UTC

Size: 1.97 KB

patch

obsolete

>From 00483ba8fe33cf0559bda8c20b892ab10aa48d41 Mon Sep 17 00:00:00 2001
>From: Steffen Ullrich <github@maulwuff.de>
>Date: Fri, 11 May 2012 21:27:40 +0200
>Subject: [PATCH] 1.73 fixes to t/dhe.t to support more openssl versions
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>---
> Changes | 4 ++++
> SSL.pm  | 2 +-
> t/dhe.t | 9 ++++-----
> 3 files changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/Changes b/Changes
>index 8156bc7..516fd74 100644
>--- a/Changes
>+++ b/Changes
>@@ -1,3 +1,7 @@
>+v1.72 2012.05.11
>+- make test t/dhe.t hopefully work for more version of openssl
>+  Thanks to paul[AT]city-fan[DOT]org for providing bug reports and
>+  testing environment
> v1.72 2012.05.10
> - set DEFAULT_CIPHER_LIST to ALL:!LOW instead of HIGH:!LOW
>   Thanks to dcostas[AT]gmail[DOT]com for problem report
>diff --git a/SSL.pm b/SSL.pm
>index ffe6ff0..59a9909 100644
>--- a/SSL.pm
>+++ b/SSL.pm
>@@ -78,7 +78,7 @@ BEGIN {
> 	}) {
> 		@ISA = qw(IO::Socket::INET);
> 	}
>-	$VERSION = '1.72';
>+	$VERSION = '1.73';
> 	$GLOBAL_CONTEXT_ARGS = {};
> 
> 	#Make $DEBUG another name for $Net::SSLeay::trace
>diff --git a/t/dhe.t b/t/dhe.t
>index 0109e9a..710cb6c 100644
>--- a/t/dhe.t
>+++ b/t/dhe.t
>@@ -32,11 +32,10 @@ my $server = IO::Socket::SSL->new(
>     SSL_cert_file => "certs/server-rsa384-dh.pem",
>     SSL_key_file  => "certs/server-rsa384-dh.pem",
>     SSL_dh_file   => "certs/server-rsa384-dh.pem",
>-    # openssl 1.0.1(beta2) complains about the rsa key too small, unless
>-    # we explicitly set version to tlsv1 or sslv3
>-    # unfortunatly the workaround fails for older openssl versions :(
>-    (Net::SSLeay::OPENSSL_VERSION_NUMBER() >= 0x10001000)
>-        ? ( SSL_version   => 'tlsv1' ):()
>+    # at least 0.9.8[ab] have problems if we don't explicitly disable
>+    # RSA or EXPORT56, and 1.0.1 complains if we have RSA authentication
>+    # enabled 
>+    SSL_cipher_list => 'ALL:RSA:!aRSA',
> ) || do {
>     notok($!);
>     exit
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1078301: 876385 | 876398 | 1093686