CA file path fix

Fri, 02 Mar 2018 20:45:02 +0100

author
Ansariel
date
Fri, 02 Mar 2018 20:45:02 +0100
changeset 55319
6501ad78684b
parent 55318
74c1342de06e
child 55325
04ed11595051

CA file path fix

indra/llvfs/lldir_mac.cpp file | annotate | diff | revisions
indra/newview/llsechandler_basic.cpp file | annotate | diff | revisions
indra/newview/llviewermedia.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llvfs/lldir_mac.cpp	Fri Mar 02 14:47:43 2018 +0100
     1.2 +++ b/indra/llvfs/lldir_mac.cpp	Fri Mar 02 20:45:02 2018 +0100
     1.3 @@ -189,7 +189,7 @@
     1.4  		mAppRODataDir = app_read_only_data_dir;
     1.5  		mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
     1.6  	}
     1.7 -	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     1.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "../Resources", "ca-bundle.crt");
     1.9  }
    1.10  
    1.11  //<FS:TS> Used by LGG's selection beams
     2.1 --- a/indra/newview/llsechandler_basic.cpp	Fri Mar 02 14:47:43 2018 +0100
     2.2 +++ b/indra/newview/llsechandler_basic.cpp	Fri Mar 02 20:45:02 2018 +0100
     2.3 @@ -1284,7 +1284,7 @@
     2.4  		
     2.5  		// grab the application ca-bundle.crt file that contains the well-known certs shipped
     2.6  		// with the product
     2.7 -		std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" );
     2.8 +		std::string ca_file_path = gDirUtilp->getCAFile();
     2.9  		LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL;
    2.10  		LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path);
    2.11  		
     3.1 --- a/indra/newview/llviewermedia.cpp	Fri Mar 02 14:47:43 2018 +0100
     3.2 +++ b/indra/newview/llviewermedia.cpp	Fri Mar 02 20:45:02 2018 +0100
     3.3 @@ -2074,7 +2074,7 @@
     3.4  
     3.5  		// the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones
     3.6  		// Qt/WebKit loads from your system location.
     3.7 -		std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" );
     3.8 +		std::string ca_path = gDirUtilp->getCAFile();
     3.9  		media_source->addCertificateFilePath( ca_path );
    3.10  
    3.11  		media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));

mercurial