Accepting request 182794 from home:bmwiedemann:branches:devel:languages:perl
use /etc/ssl/certs as default SSL_ca_path to fix bnc#828881 OBS-URL: https://build.opensuse.org/request/show/182794 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-LWP-Protocol-https?expand=0&rev=6
This commit is contained in:
parent
8b826baec4
commit
d2b29581c9
@ -54,11 +54,10 @@ diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm
|
|||||||
index f7230e2..e210049 100644
|
index f7230e2..e210049 100644
|
||||||
--- a/lib/LWP/Protocol/https.pm
|
--- a/lib/LWP/Protocol/https.pm
|
||||||
+++ b/lib/LWP/Protocol/https.pm
|
+++ b/lib/LWP/Protocol/https.pm
|
||||||
@@ -22,29 +22,6 @@ sub _extra_sock_opts
|
@@ -23,27 +23,7 @@ sub _extra_sock_opts
|
||||||
else {
|
|
||||||
$ssl_opts{SSL_verify_mode} = 0;
|
$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}) {
|
- unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
|
||||||
- eval {
|
- eval {
|
||||||
- require Mozilla::CA;
|
- require Mozilla::CA;
|
||||||
@ -80,10 +79,10 @@ index f7230e2..e210049 100644
|
|||||||
- }
|
- }
|
||||||
- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
|
- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
|
||||||
- }
|
- }
|
||||||
- }
|
+ $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs';
|
||||||
|
}
|
||||||
$self->{ssl_opts} = \%ssl_opts;
|
$self->{ssl_opts} = \%ssl_opts;
|
||||||
return (%ssl_opts, $self->SUPER::_extra_sock_opts);
|
return (%ssl_opts, $self->SUPER::_extra_sock_opts);
|
||||||
}
|
|
||||||
--
|
--
|
||||||
1.8.1.4
|
1.8.1.4
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Wed Jul 3 09:32:03 UTC 2013 - lnussel@suse.de
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user