diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 21:56:36 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 21:56:36 +0000 |
| commit | 0fa3d7705fb6a42410d1578b1fab5b7952a59e7c (patch) | |
| tree | 72c71a57659a7068f291426cb5235cb68d3436c9 /indra/newview/tests/llsecapi_test.cpp | |
| parent | 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 (diff) | |
| parent | e989b79dae7b7128c6ce4580b6731dcd3347b94e (diff) | |
Merged in DV528-merge-6.4.24 (pull request #729)
DRTVWR-528 merge up to v 6.4.24
Diffstat (limited to 'indra/newview/tests/llsecapi_test.cpp')
| -rw-r--r-- | indra/newview/tests/llsecapi_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp index caa3016d2e..37fbbb449b 100644 --- a/indra/newview/tests/llsecapi_test.cpp +++ b/indra/newview/tests/llsecapi_test.cpp @@ -57,7 +57,7 @@ void LLSecAPIBasicHandler::init() {} LLSecAPIBasicHandler::~LLSecAPIBasicHandler() {} LLPointer<LLCertificate> LLSecAPIBasicHandler::getCertificate(const std::string& pem_cert) { return NULL; } LLPointer<LLCertificate> LLSecAPIBasicHandler::getCertificate(X509* openssl_cert) { return NULL; } -LLPointer<LLCertificateChain> LLSecAPIBasicHandler::getCertificateChain(const X509_STORE_CTX* chain) { return NULL; } +LLPointer<LLCertificateChain> LLSecAPIBasicHandler::getCertificateChain(X509_STORE_CTX* chain) { return NULL; } LLPointer<LLCertificateStore> LLSecAPIBasicHandler::getCertificateStore(const std::string& store_id) { return NULL; } void LLSecAPIBasicHandler::setProtectedData(const std::string& data_type, const std::string& data_id, const LLSD& data) {} void LLSecAPIBasicHandler::addToProtectedMap(const std::string& data_type, const std::string& data_id, const std::string& map_elem, const LLSD& data) {} |