livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly handle certificate loading from UTF8 paths.

Nicky 2014-04-06 18:26:19 +02:00
parent 72faa660f7
commit 56ed43dd05
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llsechandler_basic.cpp
View File

@ -602,10 +602,16 @@ void LLBasicCertificateStore::load_from_file(const std::string& filename)
return;
}
BIO* file_bio = BIO_new(BIO_s_file());
// <FS:ND> Do not use BIO_new(BIO_s_file())/BIO_read_filename. This will fail if filename is an UTF8 encoded unicode path. Instead
// use BIO_new_file. BIO_new_file handles UTF8 encoded filenames gracefully.
// BIO* file_bio = BIO_new(BIO_s_file());
BIO *file_bio( BIO_new_file( filename.c_str(), "rt" ) );
// </FS:ND>
if(file_bio)
{
if (BIO_read_filename(file_bio, filename.c_str()) > 0)
// if (BIO_read_filename(file_bio, filename.c_str()) > 0) // <FS:ND/>
{
X509 *cert_x509 = NULL;
while((PEM_read_bio_X509(file_bio, &cert_x509, 0, NULL)) &&