octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-24 06:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in S3fsCurl::LocateBundle

Browse Source
This commit is contained in:
Takeshi Nakatani 2017-11-05 11:26:05 +00:00
parent e3c77d2906
commit 5db550a298
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/curl.cpp
View File

@ -706,12 +706,15 @@ bool S3fsCurl::LocateBundle(void)
S3fsCurl::curl_ca_bundle.assign(CURL_CA_BUNDLE); S3fsCurl::curl_ca_bundle.assign(CURL_CA_BUNDLE);
return true; return true;
} }
}else{
// Already set ca bundle variable
return true;
} }
// not set via environment variable, look in likely locations // not set via environment variable, look in likely locations
/////////////////////////////////////////// ///////////////////////////////////////////
// from curl's (7.21.2) acinclude.m4 file // following comment from curl's (7.21.2) acinclude.m4 file
/////////////////////////////////////////// ///////////////////////////////////////////
// dnl CURL_CHECK_CA_BUNDLE // dnl CURL_CHECK_CA_BUNDLE
// dnl ------------------------------------------------- // dnl -------------------------------------------------
@ -724,13 +727,36 @@ bool S3fsCurl::LocateBundle(void)
// dnl /usr/local/share/certs/ca-root.crt FreeBSD // dnl /usr/local/share/certs/ca-root.crt FreeBSD
// dnl /etc/ssl/cert.pem OpenBSD // dnl /etc/ssl/cert.pem OpenBSD
// dnl /etc/ssl/certs/ (ca path) SUSE // dnl /etc/ssl/certs/ (ca path) SUSE
///////////////////////////////////////////
// Within CURL the above path should have been checked
// according to the OS. Thus, although we do not need
// to check files here, we will only examine some files.
//
ifstream BF("/etc/pki/tls/certs/ca-bundle.crt"); ifstream BF("/etc/pki/tls/certs/ca-bundle.crt");
if(BF.good()){ if(BF.good()){
BF.close(); BF.close();
S3fsCurl::curl_ca_bundle.assign("/etc/pki/tls/certs/ca-bundle.crt"); S3fsCurl::curl_ca_bundle.assign("/etc/pki/tls/certs/ca-bundle.crt");
}else{ }else{
S3FS_PRN_ERR("%s: /etc/pki/tls/certs/ca-bundle.crt is not readable", program_name.c_str()); BF.open("/etc/ssl/certs/ca-certificates.crt");
return false; if(BF.good()){
BF.close();
S3fsCurl::curl_ca_bundle.assign("/etc/ssl/certs/ca-certificates.crt");
}else{
BF.open("/usr/share/ssl/certs/ca-bundle.crt");
if(BF.good()){
BF.close();
S3fsCurl::curl_ca_bundle.assign("/usr/share/ssl/certs/ca-bundle.crt");
}else{
BF.open("/usr/local/share/certs/ca-root.crt");
if(BF.good()){
BF.close();
S3fsCurl::curl_ca_bundle.assign("/usr/share/ssl/certs/ca-bundle.crt");
}else{
S3FS_PRN_ERR("%s: /.../ca-bundle.crt is not readable", program_name.c_str());
return false;
}
}
}
} }
return true; return true;
} }