diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
| commit | d0811218381cfa9d201d7b72532e19d98bda250a (patch) | |
| tree | 65d3c325feeac71171813d3302bd1c4517b22cb2 /indra/newview/llsechandler_basic.h | |
| parent | cc30a9e2f5b9410dcdf323d3ecdd3f6f1e2985db (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llsechandler_basic.h')
| -rw-r--r-- | indra/newview/llsechandler_basic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llsechandler_basic.h b/indra/newview/llsechandler_basic.h index 1ce5a87c75..c35617f564 100644 --- a/indra/newview/llsechandler_basic.h +++ b/indra/newview/llsechandler_basic.h @@ -47,8 +47,9 @@ class LLBasicCertificate : public LLCertificate public: LOG_CLASS(LLBasicCertificate); - LLBasicCertificate(const std::string& pem_cert); - LLBasicCertificate(X509* openSSLX509); + // The optional validation_params allow us to make the unit test time-invariant + LLBasicCertificate(const std::string& pem_cert, const LLSD* validation_params = NULL); + LLBasicCertificate(X509* openSSLX509, const LLSD* validation_params = NULL); virtual ~LLBasicCertificate(); |