diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-07-21 17:14:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-07-21 17:14:07 -0400 |
| commit | 4bf583aaa23700ec92df0fcf1b9d8978e29199f7 (patch) | |
| tree | f837807b536834f0a1df97d84309a7d5d0f7cb90 /indra/newview/llviewermedia.cpp | |
| parent | 9260fbe0bd4db438632e9f174112b4ed853fa2a0 (diff) | |
SL-429: Use a new certificate authority bundle based on data from Mozilla
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 6ed063e066..a4b947111c 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1921,11 +1921,9 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) media_source->ignore_ssl_cert_errors(true); } - // the correct way to deal with certs it to load ours from CA.pem and append them to the ones + // the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones // 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")); |