diff options
| author | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
| commit | e6765df1baa40a46b77e5362c8855a336125e5f7 (patch) | |
| tree | ffb3564aaa95b23f0d7ab6f6eeea8d08f3e9b317 /indra/newview/llsechandler_basic.h | |
| parent | b0950991988ddd56bec9074316d883a00b0cae4c (diff) | |
| parent | 02342cb9ae3140cb49ec2818fee5692b3796bf8a (diff) | |
Merged in lindenlab/viewer-bear
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(); |