livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for SL-15389 -- Pull in the patch to add the Akamai cert fix specified in SL-15370

master
Callum Prentice 2021-06-11 11:03:39 -07:00
parent 1b0e3d6818
commit 56b02aee2e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llsechandler_basic.cpp
View File

@ -915,11 +915,19 @@ void _validateCert(int validation_policy,
}
if (validation_policy & VALIDATION_POLICY_SSL_KU)
{
// This stanza of code was changed 2021-06-09 as per details in SL-15370.
// Brief summary: a renewed certificate from Akamai only contains the
// 'Digital Signature' field and not the 'Key Encipherment' one. This code
// used to look for both and throw an exception at startup (ignored) and
// (for example) when buying L$ in the Viewer (fails with a UI message
// and an entry in the Viewer log). This modified code removes the second
// check for the 'Key Encipherment' field. If Akamai can provide a
// replacement certificate that has both fields, then this modified code
// will not be required.
if (current_cert_info.has(CERT_KEY_USAGE) && current_cert_info[CERT_KEY_USAGE].isArray() &&
(!(_LLSDArrayIncludesValue(current_cert_info[CERT_KEY_USAGE],
LLSD((std::string)CERT_KU_DIGITAL_SIGNATURE))) ||
!(_LLSDArrayIncludesValue(current_cert_info[CERT_KEY_USAGE],
LLSD((std::string)CERT_KU_KEY_ENCIPHERMENT)))))
LLSD((std::string)CERT_KU_DIGITAL_SIGNATURE)))
)
{
LLTHROW(LLCertKeyUsageValidationException(current_cert_info));
}