mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 777292 - Convert some nsresult to SECStatus; r=ehsan
This commit is contained in:
parent
7fc47312ed
commit
8446afc043
@ -711,9 +711,8 @@ GetSubjectAltNames(CERTCertificate *nssCert,
|
||||
SECItem altNameExtension = {siBuffer, NULL, 0 };
|
||||
CERTGeneralName *sanNameList = nsnull;
|
||||
|
||||
nsresult rv;
|
||||
rv = CERT_FindCertExtension(nssCert, SEC_OID_X509_SUBJECT_ALT_NAME,
|
||||
&altNameExtension);
|
||||
SECStatus rv = CERT_FindCertExtension(nssCert, SEC_OID_X509_SUBJECT_ALT_NAME,
|
||||
&altNameExtension);
|
||||
if (rv != SECSuccess)
|
||||
return false;
|
||||
|
||||
|
@ -283,10 +283,10 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, PRUint3
|
||||
if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams))) {
|
||||
goto loser;
|
||||
}
|
||||
rv = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
|
||||
SECStatus stat = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
|
||||
survivingParams->GetRawPointerForNSS(),
|
||||
cvout, si->cmsg->pwfn_arg);
|
||||
if (rv != SECSuccess) {
|
||||
if (stat != SECSuccess) {
|
||||
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
|
||||
rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
|
||||
goto loser;
|
||||
|
@ -1696,11 +1696,12 @@ NS_IMETHODIMP nsNSSCertificateDB::AddCertFromBase64(const char *aBase64, const c
|
||||
nsNSSCertTrust trust;
|
||||
|
||||
// need to calculate the trust bits from the aTrust string.
|
||||
nsresult rv = CERT_DecodeTrustString(trust.GetTrust(), /* this is const, but not declared that way */(char *) aTrust);
|
||||
NS_ENSURE_SUCCESS(rv, rv); // if bad trust passed in, return error.
|
||||
SECStatus stat = CERT_DecodeTrustString(trust.GetTrust(),
|
||||
/* this is const, but not declared that way */(char *) aTrust);
|
||||
NS_ENSURE_STATE(stat == SECSuccess); // if bad trust passed in, return error.
|
||||
|
||||
|
||||
rv = ConstructX509FromBase64(aBase64, getter_AddRefs(newCert));
|
||||
nsresult rv = ConstructX509FromBase64(aBase64, getter_AddRefs(newCert));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
SECItem der;
|
||||
|
Loading…
Reference in New Issue
Block a user