diff options
| author | radare <[email protected]> | 2015-10-12 23:20:33 +0200 |
|---|---|---|
| committer | radare <[email protected]> | 2015-10-12 23:20:33 +0200 |
| commit | 3ca5ecac7427cd37947352552cc517c7db8fd4fd (patch) | |
| tree | 804464824555c020be62bc0c60bc94767098d8c7 /openssl-sys/src | |
| parent | Merge pull request #280 from ltratt/libressl_build (diff) | |
| download | rust-openssl-3ca5ecac7427cd37947352552cc517c7db8fd4fd.tar.xz rust-openssl-3ca5ecac7427cd37947352552cc517c7db8fd4fd.zip | |
Add certs.pem in cert probe list
It turns out that some distributions use /etc/ssl/certs.pem, which was causing some troubles.
Related issue https://github.com/rust-lang/cargo/issues/1978#issuecomment-147515236
Diffstat (limited to 'openssl-sys/src')
| -rw-r--r-- | openssl-sys/src/probe.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/openssl-sys/src/probe.rs b/openssl-sys/src/probe.rs index 6a67e478..e3711b54 100644 --- a/openssl-sys/src/probe.rs +++ b/openssl-sys/src/probe.rs @@ -57,10 +57,14 @@ pub fn probe() -> ProbeResult { for certs_dir in find_certs_dirs().iter() { // cert.pem looks to be an openssl 1.0.1 thing, while // certs/ca-certificates.crt appears to be a 0.9.8 thing - try(&mut result.cert_file, certs_dir.join("cert.pem")); - try(&mut result.cert_file, certs_dir.join("certs/ca-certificates.crt")); - try(&mut result.cert_file, certs_dir.join("certs/ca-root-nss.crt")); - + for cert in [ + "cert.pem", + "certs.pem", + "certs/ca-certificates.crt", + "certs/ca-root-nss.crt" + ].iter() { + try(&mut result.cert_file, certs_dir.join(cert)); + } try(&mut result.cert_dir, certs_dir.join("certs")); } result |