diff options
author | Callum Linden <callum@lindenlab.com> | 2021-10-13 16:54:08 -0700 |
---|---|---|
committer | Callum Linden <callum@lindenlab.com> | 2021-10-13 16:54:08 -0700 |
commit | 3c2ccd879cb59ac0fdcacfab1fe68bc4dcefc68b (patch) | |
tree | 3a0851d0c1d77fcd6ffa948f9c6199640b7147dd /indra/newview/llsechandler_basic.h | |
parent | 3a3296f371508c4a31a37053242ee69a574f22f0 (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
Merge with master after latest Viewer release
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 |