From 6b5c876de80451ee54de5d853de37a62e26bf6fe Mon Sep 17 00:00:00 2001 From: Steffen Ullrich Date: Sun, 4 May 2014 09:14:13 +0200 Subject: [PATCH 2/2] Debian #746576 - fix test, make it workable for Crypt::SSLeay/Net::SSL too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Písař --- lib/LWP/Protocol/https.pm | 6 +++++- t/https_proxy.t | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm index 8c87e81..6223ddf 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm @@ -21,7 +21,11 @@ sub _extra_sock_opts $ssl_opts{SSL_verifycn_scheme} = 'www'; } else { - $ssl_opts{SSL_verifycn_scheme} = 'none'; + if ( $Net::HTTPS::SSL_SOCKET_CLASS eq 'Net::SSL' ) { + $ssl_opts{SSL_verifycn_scheme} = ''; + } else { + $ssl_opts{SSL_verifycn_scheme} = 'none'; + } } if ($ssl_opts{SSL_verify_mode}) { unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { diff --git a/t/https_proxy.t b/t/https_proxy.t index 5196960..c78345b 100644 --- a/t/https_proxy.t +++ b/t/https_proxy.t @@ -66,7 +66,10 @@ my %ua; $ua{noproxy} = LWP::UserAgent->new( keep_alive => 10, # size of connection cache # server does not know the expected name and returns generic certificate - ssl_opts => { verify_hostname => 0 } + ssl_opts => { + verify_hostname => 0, + SSL_ca_file => $cafile, + } ); $ua{proxy} = LWP::UserAgent->new( -- 1.9.0