From b2f61c0e0b27b9c1dae33a85bfc4db6b3ce95dc0 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 15 Feb 2018 21:48:18 +0200 Subject: MAINT-8297 Fixed "Missing CA File" message when running under debugger on windows --- indra/newview/llsechandler_basic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsechandler_basic.cpp') diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 814cfde75d..a1dbbb307b 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1275,7 +1275,7 @@ void LLSecAPIBasicHandler::init() // grab the application ca-bundle.crt file that contains the well-known certs shipped // with the product - std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt"); + std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" ); LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL; LLPointer app_ca_store = new LLBasicCertificateStore(ca_file_path); -- cgit v1.2.3 From e55fcbeeee1d1000d06b64ef9f07a7f871ce2d83 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 21 Feb 2018 17:32:06 +0000 Subject: MAINT-8297 Removing old ca bundle --- indra/newview/llsechandler_basic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsechandler_basic.cpp') diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index a1dbbb307b..46921427a1 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1275,7 +1275,7 @@ void LLSecAPIBasicHandler::init() // grab the application ca-bundle.crt file that contains the well-known certs shipped // with the product - std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" ); + std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" ); LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL; LLPointer app_ca_store = new LLBasicCertificateStore(ca_file_path); -- cgit v1.2.3 From 5a273d430a01cd1a6121f984107a339e32632eb4 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 2 Mar 2018 19:46:06 +0200 Subject: MAINT-8297 path fix #2 --- indra/newview/llsechandler_basic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsechandler_basic.cpp') diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 46921427a1..9ab9e4a1a2 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1275,7 +1275,7 @@ void LLSecAPIBasicHandler::init() // grab the application ca-bundle.crt file that contains the well-known certs shipped // with the product - std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" ); + std::string ca_file_path = gDirUtilp->getCAFile(); LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL; LLPointer app_ca_store = new LLBasicCertificateStore(ca_file_path); -- cgit v1.2.3