diff options
| author | Steven Fackler <[email protected]> | 2015-10-12 21:13:24 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-10-12 21:13:24 -0400 |
| commit | d65ff82fbee12868df8ff366e09adcf368a8e74b (patch) | |
| tree | 804464824555c020be62bc0c60bc94767098d8c7 | |
| parent | Merge pull request #280 from ltratt/libressl_build (diff) | |
| parent | Add certs.pem in cert probe list (diff) | |
| download | rust-openssl-d65ff82fbee12868df8ff366e09adcf368a8e74b.tar.xz rust-openssl-d65ff82fbee12868df8ff366e09adcf368a8e74b.zip | |
Merge pull request #287 from radare/patch-1
Add certs.pem in cert probe list
| -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 |