gecko: changeset 334749:4235dbacb5bdf77ae45ee52d47c7fbbd9c3fdf08

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA_EP.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA_EP', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA_EP_NS_OS_SA_TS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA_EP_NS_OS_SA_TS', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_EP_NS_OS_SA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA_NS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA_NS', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA_OS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA_OS', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA_SA.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA_SA', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-CA_TS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-CA_TS', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_TS'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-CA_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-EP.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-EP', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-EP_NS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-EP_NS', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-EP_OS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-EP_OS', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-EP_SA.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-EP_SA', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-EP_TS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-EP_TS', ',,'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_TS'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-EP_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-NONE.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-NONE', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NONE'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NONE'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-NS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-NS', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-NS_OS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-NS_OS', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_OS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_OS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-NS_SA.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-NS_SA', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NONE-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-NS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-OS_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_SA'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-SA_TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-TS-int-EKU-NS_SA'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-}

deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku-NS_TS.js
+++ /dev/null
@@ -1,164 +0,0 @@
-//// AUTOGENERATED FILE, DO NOT EDIT
-// -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"use strict";
-
-do_get_profile(); // must be called before getting nsIX509CertDB
-const certdb = Cc["@mozilla.org/security/x509certdb;1"]
-                 .getService(Ci.nsIX509CertDB);
-
-function cert_from_file(filename) {
-  return constructCertFromFile(`test_cert_eku/${filename}.pem`);
-}
-
-function load_cert(cert_name, trust_string) {
-  addCertFromFile(certdb, `test_cert_eku/${cert_name}.pem`, trust_string);
-  return cert_from_file(cert_name);
-}
-
-function run_test() {
-  load_cert("ca", "CT,CT,CT");
-
-  checkCertErrorGeneric(certdb, load_cert('int-EKU-NS_TS', ',,'), PRErrorCodeSuccess, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_EP_NS_OS_SA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_OS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_TS'), PRErrorCodeSuccess, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_SA-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-CA_TS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageStatusResponder);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLClient);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageSSLServer);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_KEY_USAGE, certificateUsageSSLCA);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailSigner);
-  checkCertErrorGeneric(certdb, cert_from_file('ee-EKU-EP_NS-int-EKU-NS_TS'), SEC_ERROR_INADEQUATE_CERT_TYPE, certificateUsageEmailRecipient);

author	David Keeler <dkeeler@mozilla.com>
	Wed, 24 Feb 2016 14:20:01 -0800
changeset 334749	4235dbacb5bdf77ae45ee52d47c7fbbd9c3fdf08
parent 334101	d848a5628d801a460a7244cbcdea22d328d8b310
child 514989	6afb526ac977b1546fc49d8717f11cb00365b8c4
push id	11631
push user	dkeeler@mozilla.com
push date	Fri, 26 Feb 2016 00:12:03 +0000
reviewers	Cykesiopka, jcj
bugs	1199850
milestone	47.0a1