Backed out 2 changesets (bug 987816) for xpcshell orange

Backed out changeset 245d0cb5a7b3 (bug 987816)
Backed out changeset b714220dd39d (bug 987816)
This commit is contained in:
Wes Kocher 2014-03-28 16:57:12 -07:00
parent 52e8b47e95
commit fa738a8c6e
3 changed files with 1 additions and 20 deletions

View File

@ -145,9 +145,6 @@ ClassicVerifyCert(CERTCertificate* cert,
case certificateUsageObjectSigner:
enumUsage = certUsageObjectSigner;
break;
case certificateUsageVerifyCA:
enumUsage = certUsageVerifyCA;
break;
case certificateUsageStatusResponder:
enumUsage = certUsageStatusResponder;
break;
@ -478,7 +475,6 @@ CertVerifier::VerifyCert(CERTCertificate* cert,
case certificateUsageEmailSigner:
case certificateUsageEmailRecipient:
case certificateUsageObjectSigner:
case certificateUsageVerifyCA:
case certificateUsageStatusResponder:
break;
default:

View File

@ -100,19 +100,6 @@ function getXPCOMStatusFromNSS(statusNSS) {
return nssErrorsService.getXPCOMFromNSSError(statusNSS);
}
function checkCertErrorGeneric(certdb, cert, expectedError, usage) {
let hasEVPolicy = {};
let verifiedChain = {};
let error = certdb.verifyCertNow(cert, usage, NO_FLAGS, verifiedChain,
hasEVPolicy);
// expected error == -1 is a special marker for any error is OK
if (expectedError != -1 ) {
do_check_eq(error, expectedError);
} else {
do_check_neq (error, 0);
}
}
function _getLibraryFunctionWithNoArguments(functionName, libraryName) {
// Open the NSS library. copied from services/crypto/modules/WeaveCrypto.js
let path = ctypes.libraryName(libraryName);

View File

@ -124,9 +124,7 @@ function run_test_in_mode(useMozillaPKIX) {
cert.getUsagesString(true, verified, usages);
do_print("usages.value=" + usages.value);
do_check_eq(ca_usages[i], usages.value);
if (ca_usages[i].indexOf('SSL CA') != -1) {
checkCertErrorGeneric(certdb, cert, 0, certificateUsageVerifyCA);
}
//now the ee, names also one based
for (var j = 0; j < ee_usages[i].length; j++) {
var ee_name = "ee-" + (j + 1) + "-" + ca_name;