mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-24 17:37:30 +09:00
Update NSS to 3.41
This commit is contained in:
parent
d5f6e64f43
commit
5f0986e66f
540 changed files with 49568 additions and 10631 deletions
|
|
@ -2914,7 +2914,8 @@ PKIX_PL_Cert_CheckValidity(
|
|||
requiredUsages = ((PKIX_PL_NssContext*)plContext)->certificateUsage;
|
||||
allowOverride =
|
||||
(PRBool)((requiredUsages & certificateUsageSSLServer) ||
|
||||
(requiredUsages & certificateUsageSSLServerWithStepUp));
|
||||
(requiredUsages & certificateUsageSSLServerWithStepUp) ||
|
||||
(requiredUsages & certificateUsageIPsec));
|
||||
val = CERT_CheckCertValidTimes(cert->nssCert, timeToCheck, allowOverride);
|
||||
if (val != secCertTimeValid){
|
||||
PKIX_ERROR(PKIX_CERTCHECKCERTVALIDTIMESFAILED);
|
||||
|
|
@ -3001,8 +3002,17 @@ PKIX_PL_Cert_VerifyCertAndKeyType(
|
|||
if (CERT_CheckKeyUsage(cert->nssCert, requiredKeyUsage) != SECSuccess) {
|
||||
PKIX_ERROR(PKIX_CERTCHECKKEYUSAGEFAILED);
|
||||
}
|
||||
if (!(certType & requiredCertType)) {
|
||||
PKIX_ERROR(PKIX_CERTCHECKCERTTYPEFAILED);
|
||||
if (certUsage != certUsageIPsec) {
|
||||
if (!(certType & requiredCertType)) {
|
||||
PKIX_ERROR(PKIX_CERTCHECKCERTTYPEFAILED);
|
||||
}
|
||||
} else {
|
||||
PRBool isCritical;
|
||||
PRBool allowed = cert_EKUAllowsIPsecIKE(cert->nssCert, &isCritical);
|
||||
/* If the extension isn't critical, we allow any EKU value. */
|
||||
if (isCritical && !allowed) {
|
||||
PKIX_ERROR(PKIX_CERTCHECKCERTTYPEFAILED);
|
||||
}
|
||||
}
|
||||
cleanup:
|
||||
PKIX_DECREF(basicConstraints);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue