Bug 1115761, Part 2: Use NotReached more consistently in pkixnss.cpp, r=jcj

--HG--
extra : rebase_source : 80647fc11d40d822dc042af1d797cb34062a84ab
This commit is contained in:
Brian Smith 2014-12-23 22:35:53 -08:00
parent b88b8f38dd
commit b3bf235584

View File

@ -127,8 +127,8 @@ VerifySignedData(const SignedDataWithSignature& sd,
break;
case SignatureAlgorithm::unsupported_algorithm:
default:
PR_NOT_REACHED("unknown signature algorithm");
return Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED;
return NotReached("unknown signature algorithm",
Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED);
}
Result rv;
@ -164,8 +164,7 @@ DigestBuf(Input item, /*out*/ uint8_t* digestBuf, size_t digestBufLen)
static_assert(TrustDomain::DIGEST_LENGTH == SHA1_LENGTH,
"TrustDomain::DIGEST_LENGTH must be 20 (SHA-1 digest length)");
if (digestBufLen != TrustDomain::DIGEST_LENGTH) {
PR_NOT_REACHED("invalid hash length");
return Result::FATAL_ERROR_INVALID_ARGS;
return NotReached("invalid hash length", Result::FATAL_ERROR_INVALID_ARGS);
}
SECItem itemSECItem = UnsafeMapInputToSECItem(item);
if (itemSECItem.len >