reverting after lnussels review, proper fix in perl-IO-Socket-SSL

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-LWP-Protocol-https?expand=0&rev=7
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2013-07-24 14:53:54 +00:00 committed by Git OBS Bridge
parent d2b29581c9
commit 63854e2f1f
2 changed files with 5 additions and 9 deletions

View File

@ -54,10 +54,11 @@ diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm
index f7230e2..e210049 100644
--- a/lib/LWP/Protocol/https.pm
+++ b/lib/LWP/Protocol/https.pm
@@ -23,27 +23,7 @@ sub _extra_sock_opts
@@ -22,29 +22,6 @@ sub _extra_sock_opts
else {
$ssl_opts{SSL_verify_mode} = 0;
}
if ($ssl_opts{SSL_verify_mode}) {
- if ($ssl_opts{SSL_verify_mode}) {
- unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
- eval {
- require Mozilla::CA;
@ -79,10 +80,10 @@ index f7230e2..e210049 100644
- }
- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
- }
+ $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs';
}
- }
$self->{ssl_opts} = \%ssl_opts;
return (%ssl_opts, $self->SUPER::_extra_sock_opts);
}
--
1.8.1.4

View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Thu Jul 11 07:43:42 UTC 2013 - bwiedemann@suse.com
- use /etc/ssl/certs as default SSL_ca_path to fix bnc#828881
-------------------------------------------------------------------
Wed Jul 3 09:32:03 UTC 2013 - lnussel@suse.de