diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
commit | 42415ab0cf05cbb1c470ae65a2ab7bed005927dd (patch) | |
tree | 7bed99ca0b8131d067ed0dea01723f6cb7f2456d /indra/newview/llsechandler_basic.h | |
parent | 75cf90723f63d1d80b2a3b4b8aa9536cadcda8cb (diff) | |
parent | 6b2e40157b1f103b8394aeffcce2115321943ebf (diff) |
Merged in DV546-merge-6.4.24 (pull request #731)
DRTVWR-546 merge up to v 6.4.24
Diffstat (limited to 'indra/newview/llsechandler_basic.h')
-rw-r--r-- | indra/newview/llsechandler_basic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsechandler_basic.h b/indra/newview/llsechandler_basic.h index 0bc7f5230f..82670f9083 100644 --- a/indra/newview/llsechandler_basic.h +++ b/indra/newview/llsechandler_basic.h @@ -197,7 +197,7 @@ class LLBasicCertificateChain : virtual public LLBasicCertificateVector, public { public: - LLBasicCertificateChain(const X509_STORE_CTX * store); + LLBasicCertificateChain(X509_STORE_CTX * store); virtual ~LLBasicCertificateChain() {} @@ -241,7 +241,7 @@ public: virtual LLPointer<LLCertificate> getCertificate(X509* openssl_cert); // instantiate a chain from an X509_STORE_CTX - virtual LLPointer<LLCertificateChain> getCertificateChain(const X509_STORE_CTX* chain); + virtual LLPointer<LLCertificateChain> getCertificateChain(X509_STORE_CTX* chain); // instantiate a cert store given it's id. if a persisted version // exists, it'll be loaded. If not, one will be created (but not |