diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-05 04:13:23 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-05 04:13:23 +0300 |
| commit | 3ec597069594d538822d42b041f966c9820fe291 (patch) | |
| tree | cf9d97b3e0296064c19eb93709db31a4845f45cf /indra/newview/llsecapi.h | |
| parent | 128f0833cf8076a0eb76eb672017ac54c272ca79 (diff) | |
| parent | 786de05651f25d42aacc92c4905375bf1fbd6562 (diff) | |
Merge branch 'marchcat/SL-13910' into DRTVWR-503-maint
Diffstat (limited to 'indra/newview/llsecapi.h')
| -rw-r--r-- | indra/newview/llsecapi.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h index ae87cac53c..14059f828a 100644 --- a/indra/newview/llsecapi.h +++ b/indra/newview/llsecapi.h @@ -75,6 +75,7 @@ #define CERT_EXTENDED_KEY_USAGE "extendedKeyUsage" #define CERT_EKU_SERVER_AUTH SN_server_auth +#define CERT_EKU_TLS_SERVER_AUTH LN_server_auth #define CERT_SUBJECT_KEY_IDENTFIER "subjectKeyIdentifier" #define CERT_AUTHORITY_KEY_IDENTIFIER "authorityKeyIdentifier" @@ -334,11 +335,7 @@ std::ostream& operator <<(std::ostream& s, const LLCredential& cred); class LLCertException: public LLException { public: - LLCertException(const LLSD& cert_data, const std::string& msg): LLException(msg), - mCertData(cert_data) - { - LL_WARNS("SECAPI") << "Certificate Error: " << msg << LL_ENDL; - } + LLCertException(const LLSD& cert_data, const std::string& msg); virtual ~LLCertException() throw() {} LLSD getCertData() const { return mCertData; } protected: |