From 4bf583aaa23700ec92df0fcf1b9d8978e29199f7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 21 Jul 2016 17:14:07 -0400 Subject: SL-429: Use a new certificate authority bundle based on data from Mozilla --- indra/llvfs/lldir_linux.cpp | 2 +- indra/llvfs/lldir_mac.cpp | 2 +- indra/llvfs/lldir_solaris.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llvfs') diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 7a4034c228..b3cd4ef9af 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -220,7 +220,7 @@ void LLDir_Linux::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_Linux::countFilesInDir(const std::string &dirname, const std::string &mask) diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 4038c92465..6d9b35fb30 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -173,7 +173,7 @@ void LLDir_Mac::initAppDirs(const std::string &app_name, mAppRODataDir = app_read_only_data_dir; mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; } - mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem"); + mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt"); } std::string LLDir_Mac::getCurPath() diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp index b43b2f27ce..7e8e578d7f 100644 --- a/indra/llvfs/lldir_solaris.cpp +++ b/indra/llvfs/lldir_solaris.cpp @@ -238,7 +238,7 @@ void LLDir_Solaris::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_Solaris::countFilesInDir(const std::string &dirname, const std::string &mask) -- cgit v1.2.3 From ac10109dfa2f014dcc1992cda413ef58759f3448 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 28 Jul 2016 14:05:38 -0400 Subject: update CA file name in one place I missed --- indra/llvfs/lldir_win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llvfs') diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index ebc8fdca33..46f946d08a 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -210,7 +210,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) -- cgit v1.2.3