min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #287 from radare/patch-1 

Add certs.pem in cert probe list
This commit is contained in:
Steven Fackler 2015-10-12 21:13:24 -04:00
parent aad933e507 3ca5ecac74
commit d65ff82fbe
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openssl-sys/src/probe.rs
View File

@ -57,10 +57,14 @@ pub fn probe() -> ProbeResult {
for certs_dir in find_certs_dirs().iter() { for certs_dir in find_certs_dirs().iter() {
// cert.pem looks to be an openssl 1.0.1 thing, while // cert.pem looks to be an openssl 1.0.1 thing, while
// certs/ca-certificates.crt appears to be a 0.9.8 thing // certs/ca-certificates.crt appears to be a 0.9.8 thing
try(&mut result.cert_file, certs_dir.join("cert.pem")); for cert in [
try(&mut result.cert_file, certs_dir.join("certs/ca-certificates.crt")); "cert.pem",
try(&mut result.cert_file, certs_dir.join("certs/ca-root-nss.crt")); "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")); try(&mut result.cert_dir, certs_dir.join("certs"));
} }
result result