MAINT-8297 Fixed "Missing CA File" message when running under debugger on windows

Thu, 15 Feb 2018 21:48:18 +0200

author
andreykproductengine <andreykproductengine@lindenlab.com>
date
Thu, 15 Feb 2018 21:48:18 +0200
changeset 55286
da06a005f97a
parent 55285
c8b6574c3f5b
child 55290
74516ccad384

MAINT-8297 Fixed "Missing CA File" message when running under debugger on windows

indra/llvfs/lldir_win32.cpp file | annotate | diff | revisions
indra/newview/llsechandler_basic.cpp file | annotate | diff | revisions
indra/newview/llviewermedia.cpp file | annotate | diff | revisions
indra/newview/viewer_manifest.py file | annotate | diff | revisions
     1.1 --- a/indra/llvfs/lldir_win32.cpp	Wed Feb 14 20:17:55 2018 +0200
     1.2 +++ b/indra/llvfs/lldir_win32.cpp	Thu Feb 15 21:48:18 2018 +0200
     1.3 @@ -233,7 +233,7 @@
     1.4  		LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
     1.5  	}
     1.6  
     1.7 -	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     1.8 +	mCAFile = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" );
     1.9  }
    1.10  
    1.11  U32 LLDir_Win32::countFilesInDir(const std::string &dirname, const std::string &mask)
     2.1 --- a/indra/newview/llsechandler_basic.cpp	Wed Feb 14 20:17:55 2018 +0200
     2.2 +++ b/indra/newview/llsechandler_basic.cpp	Thu Feb 15 21:48:18 2018 +0200
     2.3 @@ -1275,7 +1275,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_APP_SETTINGS, "ca-bundle.crt");
     2.8 +		std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" );
     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	Wed Feb 14 20:17:55 2018 +0200
     3.2 +++ b/indra/newview/llviewermedia.cpp	Thu Feb 15 21:48:18 2018 +0200
     3.3 @@ -2029,7 +2029,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_APP_SETTINGS, "ca-bundle.crt" );
     3.8 +		std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" );
     3.9  		media_source->addCertificateFilePath( ca_path );
    3.10  
    3.11  		media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));
     4.1 --- a/indra/newview/viewer_manifest.py	Wed Feb 14 20:17:55 2018 +0200
     4.2 +++ b/indra/newview/viewer_manifest.py	Thu Feb 15 21:48:18 2018 +0200
     4.3 @@ -595,6 +595,9 @@
     4.4          self.path("featuretable.txt")
     4.5          self.path("ca-bundle.crt")
     4.6  
     4.7 +        with self.prefix(src=pkgdir,dst="app_settings"):
     4.8 +            self.path("ca-bundle.crt")
     4.9 +
    4.10          # Media plugins - CEF
    4.11          with self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"):
    4.12              self.path("media_plugin_cef.dll")
    4.13 @@ -1052,6 +1055,9 @@
    4.14                          self.path("SecondLife.nib")
    4.15                          self.path("ca-bundle.crt")
    4.16  
    4.17 +                        with self.prefix(src=pkgdir,dst="app_settings"):
    4.18 +                            self.path("ca-bundle.crt")
    4.19 +
    4.20                          self.path("SecondLife.nib")
    4.21  
    4.22                          # Translations
    4.23 @@ -1510,6 +1516,9 @@
    4.24          self.path("featuretable_linux.txt")
    4.25          self.path("ca-bundle.crt")
    4.26  
    4.27 +        with self.prefix(src=pkgdir,dst="app_settings"):
    4.28 +            self.path("ca-bundle.crt")
    4.29 +
    4.30      def package_finish(self):
    4.31          installer_name = self.installer_base_name()
    4.32  

mercurial