Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace CA file.

Browse Source
This commit is contained in:
Shyotl
2018-08-10 18:16:48 -05:00
parent eb747e2304
commit 369a3ed909
4 changed files with 14407 additions and 3901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llvfs/lldir_win32.cpp
View File

@@ -217,7 +217,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name,
}
}
mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");
mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
}
U32 LLDir_Win32::countFilesInDir(const std::string &dirname, const std::string &mask)

3899
indra/newview/app_settings/CA.pem
View File

File diff suppressed because it is too large Load Diff

14405
indra/newview/app_settings/ca-bundle.crt Normal file
View File

File diff suppressed because it is too large Load Diff

2
indra/newview/llviewermedia.cpp
View File

@@ -1985,7 +1985,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
// Qt/WebKit loads from your system location.
// Note: This needs the new CA.pem file with the Equifax Secure Certificate Authority
// cert at the bottom: (MIIDIDCCAomgAwIBAgIENd70zzANBg)
std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "CA.pem" );
std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "ca-bundle.crt" );
media_source->addCertificateFilePath( ca_path );
media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));