summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-07-21 17:14:07 -0400
committerOz Linden <oz@lindenlab.com>2016-07-21 17:14:07 -0400
commit4bf583aaa23700ec92df0fcf1b9d8978e29199f7 (patch)
treef837807b536834f0a1df97d84309a7d5d0f7cb90 /indra/llvfs
parent9260fbe0bd4db438632e9f174112b4ed853fa2a0 (diff)
SL-429: Use a new certificate authority bundle based on data from Mozilla
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir_linux.cpp2
-rw-r--r--indra/llvfs/lldir_mac.cpp2
-rw-r--r--indra/llvfs/lldir_solaris.cpp2
3 files changed, 3 insertions, 3 deletions
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)