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/llsechandler_basic.cpp | |
| parent | 128f0833cf8076a0eb76eb672017ac54c272ca79 (diff) | |
| parent | 786de05651f25d42aacc92c4905375bf1fbd6562 (diff) | |
Merge branch 'marchcat/SL-13910' into DRTVWR-503-maint
Diffstat (limited to 'indra/newview/llsechandler_basic.cpp')
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 8a922aee4f..656a2cf8cf 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -925,8 +925,11 @@ void _validateCert(int validation_policy, } // only validate EKU if the cert has it if(current_cert_info.has(CERT_EXTENDED_KEY_USAGE) && current_cert_info[CERT_EXTENDED_KEY_USAGE].isArray() && - (!_LLSDArrayIncludesValue(current_cert_info[CERT_EXTENDED_KEY_USAGE], - LLSD((std::string)CERT_EKU_SERVER_AUTH)))) + ( (!_LLSDArrayIncludesValue(current_cert_info[CERT_EXTENDED_KEY_USAGE], + LLSD((std::string)CERT_EKU_SERVER_AUTH))) + || (!_LLSDArrayIncludesValue(current_cert_info[CERT_EXTENDED_KEY_USAGE], + LLSD((std::string)CERT_EKU_TLS_SERVER_AUTH))) + )) { LLTHROW(LLCertKeyUsageValidationException(current_cert_info)); } |