Bug 1053620: Replaces uses of PR_Abort with std::abort in mozilla::pkix, r=keeler

--HG--
extra : rebase_source : 2e1f3eec5305e89bfa28fbda856b4e36515a2819
This commit is contained in:
Brian Smith 2014-08-04 19:12:34 -07:00
parent 049e728e5c
commit 115fe9972e
4 changed files with 13 additions and 13 deletions

View File

@ -36,7 +36,7 @@ namespace mozilla { namespace pkix { namespace test {
NSSTest::SetUpTestCase()
{
if (NSS_NoDB_Init(nullptr) != SECSuccess) {
PR_Abort();
abort();
}
now = Now();
@ -49,7 +49,7 @@ NSSTest::NSSTest()
: arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE))
{
if (!arena) {
PR_Abort();
abort();
}
}

View File

@ -210,7 +210,7 @@ public:
// Initialize the tail of the cert chains we'll be using once, to make the
// tests run faster (generating the keys is slow).
if (!trustDomain.SetUpCertChainTail()) {
PR_Abort();
abort();
}
}

View File

@ -123,7 +123,7 @@ public:
{
NSSTest::SetUpTestCase();
if (!SetUpTestCaseInner()) {
PR_Abort();
abort();
}
}
@ -135,7 +135,7 @@ public:
// The result of ASCIIToDERName is owned by the arena
if (InitInputFromSECItem(ASCIIToDERName(arena.get(), rootName),
rootNameDER) != Success) {
PR_Abort();
abort();
}
Input serialNumberDER;
@ -143,17 +143,17 @@ public:
if (InitInputFromSECItem(
CreateEncodedSerialNumber(arena.get(), ++rootIssuedCount),
serialNumberDER) != Success) {
PR_Abort();
abort();
}
Input rootSPKIDER;
if (InitInputFromSECItem(rootSPKI.get(), rootSPKIDER) != Success) {
PR_Abort();
abort();
}
endEntityCertID = new (std::nothrow) CertID(rootNameDER, rootSPKIDER,
serialNumberDER);
if (!endEntityCertID) {
PR_Abort();
abort();
}
}
@ -807,11 +807,11 @@ public:
"CN=OCSPGetCertTrustTest Signer", OCSPResponseContext::good,
byKey, SEC_OID_OCSP_RESPONDER, &signerCertDER));
if (response.Init(createdResponse) != Success) {
PR_Abort();
abort();
}
if (response.GetLength() == 0 || signerCertDER.GetLength() == 0) {
PR_Abort();
abort();
}
}

View File

@ -223,7 +223,7 @@ private:
break;
default:
PR_NOT_REACHED("EncodeLength: bad lengthLength");
PR_Abort();
abort();
}
}
@ -293,7 +293,7 @@ HashAlgorithmToLength(SECOidTag hashAlg)
return SHA512_LENGTH;
default:
PR_NOT_REACHED("HashAlgorithmToLength: bad hashAlg");
PR_Abort();
abort();
}
return 0;
}
@ -1416,7 +1416,7 @@ CertStatus(OCSPResponseContext& context)
}
default:
PR_NOT_REACHED("CertStatus: bad context.certStatus");
PR_Abort();
abort();
}
return nullptr;
}