]>
Commit | Line | Data |
---|---|---|
8e5de72c JP |
1 | diff -urN mbank-cli-1.2.2.orig/mbank-cli mbank-cli-1.2.2/mbank-cli |
2 | --- mbank-cli-1.2.2.orig/mbank-cli 2014-10-25 12:19:48.139241025 +0200 | |
3 | +++ mbank-cli-1.2.2/mbank-cli 2014-10-25 12:20:41.925905849 +0200 | |
4 | @@ -547,36 +547,7 @@ | |
dfc0e45e | 5 | |
8e5de72c | 6 | sub get_default_ca_path |
dfc0e45e | 7 | { |
8e5de72c JP |
8 | - my ($name, @hashes) = @_; |
9 | - my $filename = "$name.crt"; | |
10 | - $filename =~ y/ /_/; | |
11 | - my $path = "/usr/share/ca-certificates/mozilla/$filename"; | |
12 | - if (-r $path) { | |
13 | - return $path; | |
14 | - } | |
15 | - my $ssl_cert_dir = $ENV{SSL_CERT_DIR}; | |
16 | - if (not defined($ssl_cert_dir) and $Net::SSLeay::VERSION >= 1.43) { | |
17 | - # https://www.openssl.org/docs/crypto/SSLeay_version.html | |
18 | - # SSLEAY_DIR == 5 | |
19 | - my $openssl_info = Net::SSLeay::SSLeay_version(5); | |
20 | - my ($openssl_dir) = $openssl_info =~ m/\AOPENSSLDIR: "(.*)"\Z/; | |
21 | - if (defined($openssl_dir)) { | |
22 | - $ssl_cert_dir = "$openssl_dir/certs"; | |
23 | - } | |
24 | - } | |
25 | - if (defined($ssl_cert_dir)) { | |
26 | - for my $hash (@hashes) { | |
27 | - $path = "$ssl_cert_dir/$hash.0"; | |
28 | - # TODO: actually check if this is the certificate we want | |
29 | - # hash collisions are unlikely, but not impossible | |
30 | - -r $path or next; | |
31 | - my $rpath = readlink($path) or next; | |
32 | - $rpath =~ m{\A/} | |
33 | - or $rpath = "$ssl_cert_dir/$rpath"; | |
34 | - return $rpath; | |
35 | - } | |
36 | - } | |
37 | - return "$FindBin::Bin/ca.crt"; | |
38 | + return '/etc/certs/ca-certificates.crt'; | |
39 | } | |
40 | ||
41 | # =========================== |