wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1000544: Use "Fail(x, y)" instead of "PR_SetError(y, 0); return x;" more consistently, r=mmc

Browse Source 
--HG--
extra : rebase_source : 96addac738b8ffe39c7a92d546388d5f13fc2340
This commit is contained in:
Brian Smith 2014-04-23 14:13:32 -07:00
parent 5f867b5e5d
commit c402b1e960
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/pkix/lib/pkixbuild.cpp
View File

@ -256,8 +256,7 @@ BuildForward(TrustDomain& trustDomain,
// If we found a valid chain but deferred reporting an error with the
// end-entity certificate, report it now.
if (deferredEndEntityError != 0) {
PR_SetError(deferredEndEntityError, 0);
return FatalError;
return Fail(FatalError, deferredEndEntityError);
}
SECStatus srv = trustDomain.CheckRevocation(endEntityOrCA,
@ -279,8 +278,7 @@ BuildForward(TrustDomain& trustDomain,
switch (currentError) {
case 0:
PR_NOT_REACHED("Error code not set!");
PR_SetError(PR_INVALID_STATE_ERROR, 0);
return FatalError;
return Fail(FatalError, PR_INVALID_STATE_ERROR);
case SEC_ERROR_UNTRUSTED_CERT:
currentError = SEC_ERROR_UNTRUSTED_ISSUER;
break;

18
security/pkix/lib/pkixcheck.cpp
View File

@ -122,8 +122,7 @@ CheckCertificatePolicies(BackCert& cert, EndEntityOrCA endEntityOrCA,
// inhibitAnyPolicy extension is present and we need to evaluate certificate
// policies.
if (cert.encodedInhibitAnyPolicy) {
PR_SetError(SEC_ERROR_POLICY_VALIDATION_FAILED, 0);
return RecoverableError;
return Fail(RecoverableError, SEC_ERROR_POLICY_VALIDATION_FAILED);
}
// The root CA certificate may omit the policies that it has been
@ -135,8 +134,7 @@ CheckCertificatePolicies(BackCert& cert, EndEntityOrCA endEntityOrCA,
}
if (!cert.encodedCertificatePolicies) {
PR_SetError(SEC_ERROR_POLICY_VALIDATION_FAILED, 0);
return RecoverableError;
return Fail(RecoverableError, SEC_ERROR_POLICY_VALIDATION_FAILED);
}
ScopedPtr<CERTCertificatePolicies, CERT_DestroyCertificatePoliciesExtension>
@ -158,8 +156,7 @@ CheckCertificatePolicies(BackCert& cert, EndEntityOrCA endEntityOrCA,
}
}
PR_SetError(SEC_ERROR_POLICY_VALIDATION_FAILED, 0);
return RecoverableError;
return Fail(RecoverableError, SEC_ERROR_POLICY_VALIDATION_FAILED);
}
// BasicConstraints ::= SEQUENCE {
@ -354,8 +351,7 @@ CheckNameConstraints(BackCert& cert)
// PR_SetError when it fails. We set the error code here, though this
// may be papering over some fatal errors. NSS's
// cert_VerifyCertChainOld does something similar.
PR_SetError(SEC_ERROR_CERT_NOT_IN_NAME_SPACE, 0);
return RecoverableError;
return Fail(RecoverableError, SEC_ERROR_CERT_NOT_IN_NAME_SPACE);
}
currentName = CERT_GetNextGeneralName(currentName);
} while (currentName != names);
@ -415,8 +411,7 @@ CheckExtendedKeyUsage(EndEntityOrCA endEntityOrCA, const SECItem* encodedEKUs,
// If the EKU extension was included, then the required EKU must be in the
// list.
if (!found) {
PR_SetError(SEC_ERROR_INADEQUATE_CERT_TYPE, 0);
return RecoverableError;
return Fail(RecoverableError, SEC_ERROR_INADEQUATE_CERT_TYPE);
}
}
@ -479,8 +474,7 @@ CheckIssuerIndependentProperties(TrustDomain& trustDomain,
return rv;
}
if (trustLevel == TrustDomain::ActivelyDistrusted) {
PORT_SetError(SEC_ERROR_UNTRUSTED_CERT);
return RecoverableError;
return Fail(RecoverableError, SEC_ERROR_UNTRUSTED_CERT);
}
if (trustLevel != TrustDomain::TrustAnchor &&
trustLevel != TrustDomain::InheritsTrust) {

3
security/pkix/lib/pkixder.h
View File

@ -376,8 +376,7 @@ Boolean(Input& input, /*out*/ bool& value)
case 0: value = false; return Success;
case 0xFF: value = true; return Success;
default:
PR_SetError(SEC_ERROR_BAD_DER, 0);
return Failure;
return Fail(SEC_ERROR_BAD_DER);
}
}