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/llsecapi.h | |
| parent | 3a3296f371508c4a31a37053242ee69a574f22f0 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge with master after latest Viewer release
Diffstat (limited to 'indra/newview/llsecapi.h')
| -rw-r--r-- | indra/newview/llsecapi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h index 14059f828a..410737b27f 100644 --- a/indra/newview/llsecapi.h +++ b/indra/newview/llsecapi.h @@ -452,7 +452,7 @@ public: virtual LLPointer<LLCertificate> getCertificate(X509* openssl_cert)=0; // instantiate a chain from an X509_STORE_CTX - virtual LLPointer<LLCertificateChain> getCertificateChain(const X509_STORE_CTX* chain)=0; + virtual LLPointer<LLCertificateChain> getCertificateChain(X509_STORE_CTX* chain)=0; // 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 @@ -533,6 +533,8 @@ public: }; void initializeSecHandler(); + +void clearSecHandler(); // retrieve a security api depending on the api type LLPointer<LLSecAPIHandler> getSecHandler(const std::string& handler_type); |