Bug 942918 - remove ev tests that use crl for revocation check. r=dkeeler

build/pgo/certs/evroot.ca

@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFljCCBH6gAwIBAgIJAK/FPSJmJkkyMA0GCSqGSIb3DQEBBQUAMIHhMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxIzAh
-BgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0wGwYDVQQLExRTZWN1
-cml0eSBFbmdpbmVlcmluZzEmMCQGA1UEAxMdRVYgVGVzdGluZyAodW50cnVzdHdv
-cnRoeSkgQ0ExEzARBgNVBCkTCmV2LXRlc3QtY2ExLDAqBgkqhkiG9w0BCQEWHWNo
-YXJsYXRhbkB0ZXN0aW5nLmV4YW1wbGUuY29tMB4XDTEzMDIxNDE3NDkwMFoXDTIz
-MDIxMjE3NDkwMFowgeExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UE
-BxMNTW91bnRhaW4gVmlldzEjMCEGA1UEChMaTW96aWxsYSAtIEVWIGRlYnVnIHRl
-c3QgQ0ExHTAbBgNVBAsTFFNlY3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYDVQQDEx1F
-ViBUZXN0aW5nICh1bnRydXN0d29ydGh5KSBDQTETMBEGA1UEKRMKZXYtdGVzdC1j
-YTEsMCoGCSqGSIb3DQEJARYdY2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBsZS5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk+k5mvnrxhVdVnhaxCeDG
-ZC5kcC8951K3xTkh2JMtUpSQL2IoGLOZOWTNY+2wGNyHbdJjKDv1d0bzZfz3yDkB
-AbY6OcxS4WkwccKsyIzkdacpYWhi7kEFevm9p7TI8jdrpKmItrlqfZKfteh+K+DF
-XZF7xp6zpoUis6dykmk5v8RivpCZl7HIlsOW0wSqCocXWH/WWFgAQyozjW8MgGOL
-/eV2aLsx+yg7it9GMMtyidggwvlYM7O8vY0gJqQKXntbHq1zV7jIJ3bXzJceur+G
-Ce4HvsRHAQUSl6jUfm00aKkqS+1t3svZURIKM6qWAuIKMGcspv+L8lyn1KImG8M5
-AgMBAAGjggFNMIIBSTAdBgNVHQ4EFgQUyJg651hwk+3BV0rQvQZv9n2bWPYwggEY
-BgNVHSMEggEPMIIBC4AUyJg651hwk+3BV0rQvQZv9n2bWPahgeekgeQwgeExCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEj
-MCEGA1UEChMaTW96aWxsYSAtIEVWIGRlYnVnIHRlc3QgQ0ExHTAbBgNVBAsTFFNl
-Y3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYDVQQDEx1FViBUZXN0aW5nICh1bnRydXN0
-d29ydGh5KSBDQTETMBEGA1UEKRMKZXYtdGVzdC1jYTEsMCoGCSqGSIb3DQEJARYd
-Y2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBsZS5jb22CCQCvxT0iZiZJMjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAcKVLC9MbdSZjzkVBseCm6t49aIIBm
-xQrsTNV2Gnp5eIXBfUhNAfD0zbBcKHK9AfHmNT8ZK6iABjiOrnn6yQNufW5MMdNx
-+/4FtTmdlBPLpyuBY7re+XbIaPxr/jB9jJ1pmh52xH3wMkO7ATDQ2fqFnODFrUKS
-UpXzuydPnsCdu32KPSnewIrkDB10Sah7vw3uwASO2GWqaFtUDFWGpt6rYQTcOF8g
-7a6Zj0johBMQFHE3HDRebWxiOf21ppN/tvv0gtGiA0ZIXBezeLaJ+Hob1xTbi4sw
-sGYDKHPCrLuTZWXmkv0rAIkLLK4VHbsA5xYPQNJJsTpX3u0Z0vZxJd9/
------END CERTIFICATE-----

build/pgo/server-locations.txt

@@ -101,8 +101,6 @@ https://mismatch.expired.example.com:443	privileged,cert=expired
 https://mismatch.untrusted.example.com:443	privileged,cert=untrusted
 https://untrusted-expired.example.com:443	privileged,cert=untrustedandexpired
 https://mismatch.untrusted-expired.example.com:443	privileged,cert=untrustedandexpired
-https://ev-valid.example.com:443	privileged,cert=evvalid
-https://ev-invalid.example.com:443      priviliged,cert=evinvalid
 
 # This is here so that we don't load the default live bookmark over
 # the network in every test suite.

security/manager/ssl/src/nsIdentityChecking.cpp

@@ -119,21 +119,6 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
    * certs are skipped as these debug EV certs are NOT part of the default trust
    * store.
    */
-  {
-    // This is the testing EV signature. (mochitest)
-    // C=US, ST=CA, L=Mountain View, O=Mozilla - EV debug test CA, OU=Security Engineering, CN=EV Testing (untrustworthy) CA/name=ev-test-ca/emailAddress=charlatan@testing.example.com
-    "1.3.6.1.4.1.13769.666.666.666.1.500.9.1",
-    "DEBUGtesting EV OID",
-    SEC_OID_UNKNOWN,
-    "AD:FE:0E:44:16:45:B0:17:46:8B:76:01:74:B7:FF:64:5A:EC:35:91",
-    "MIHhMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWlu"
-    "IFZpZXcxIzAhBgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0wGwYD"
-    "VQQLExRTZWN1cml0eSBFbmdpbmVlcmluZzEmMCQGA1UEAxMdRVYgVGVzdGluZyAo"
-    "dW50cnVzdHdvcnRoeSkgQ0ExEzARBgNVBCkTCmV2LXRlc3QtY2ExLDAqBgkqhkiG"
-    "9w0BCQEWHWNoYXJsYXRhbkB0ZXN0aW5nLmV4YW1wbGUuY29t",
-    "AK/FPSJmJkky",
-    nullptr
-  },
   {
     // This is the testing EV signature (xpcshell) (RSA)
     // CN=XPCShell EV Testing (untrustworthy) CA,OU=Security Engineering,O=Mozilla - EV debug test CA,L=Mountain View,ST=CA,C=US"
@@ -1148,8 +1133,8 @@ nsNSSComponent::IdentityInfoInit()
     entry.cert = CERT_FindCertByIssuerAndSN(nullptr, &ias);
 
 #ifdef DEBUG
-    // The debug CA certs are at positions 0-1, and are NOT in the NSS root db.
-    if (iEV > 1) {
+    // The debug CA cert is at positions 0, and is NOT in the NSS root db.
+    if (iEV > 0) {
        NS_ASSERTION(entry.cert, "Could not find EV root in NSS storage");
     }
 #endif

security/manager/ssl/tests/mochitest/bugs/mochitest.ini

@@ -3,5 +3,3 @@
 [test_bug480509.html]
 [test_bug483440.html]
 [test_bug484111.html]
-[test_ev_validation.html]
-[test_ev_validation_child.html]

security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html

@@ -1,57 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=813418
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 813418</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=813418">Mozilla Bug 813418</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-<script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-
-  var wnd = window.open("https://ev-valid.example.com/tests/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html");
-  window.addEventListener("message", function(event) {
-     if (event.origin == "https://ev-valid.example.com") {
-       if (SpecialPowers.isDebugBuild) {
-         is(event.data, "EV", "Child was EV valid (debug build).");
-       }
-       else {
-          is(event.data, "secure", "Child was just secure (NO EV) no ev flags present (non -debug build).");
-       }
-       wnd.close();
-       wnd = window.open("https://example.com/tests/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html");
-     }
-     else if (event.origin == "https://example.com") {
-       is(event.data, "secure", "Child was just secure (NO EV) no ev flags present.");
-       wnd.close();
-       wnd = window.open("https://ev-invalid.example.com/tests/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html");
-     }
-     else if (event.origin == "https://ev-invalid.example.com") {
-       is(event.data, "secure", "Child was just secure (NO EV ev cert from invalid anchor).");
-       wnd.close();
-       SimpleTest.finish(); //expected end of tests.
-     }
-     else{
-       ok(false,"something is broken");
-       SimpleTest.finish();
-     }
-
-    }, false);
-
-</script>
-</pre>
-</body>
-</html>

security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html

@@ -1,62 +0,0 @@
-<html>
-<head>
-<title></title>
-<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript">
-
-function finish(state) {
-  try {
-    window.opener.postMessage(state, "*");
-    //the opener should close this window, no
-    // need to call simpletest.finish()
-    return;
-  }
-  catch(e){
-    if (window.opener) {
-      //could not sent the message?
-      ok(false,"could no opener window");
-    }
-  }
-}
-
-function onWindowLoad()
-{
-  if (!window.opener) {
-    ok(true, "Direct call, nothing to do");
-    SimpleTest.finish();
-  }
-
-  var ui = SpecialPowers.wrap(window)
-     .QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
-     .getInterface(SpecialPowers.Ci.nsIWebNavigation)
-     .QueryInterface(SpecialPowers.Ci.nsIDocShell)
-     .securityUI;
-
-  var isInsecure = !ui ||
-     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IS_INSECURE);
-  var isBroken = ui &&
-     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IS_BROKEN);
-  var isEV = ui &&
-     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL);
- 
-  var gotState;
-  if (isInsecure)
-    gotState = "insecure";
-  else if (isBroken)
-    gotState = "broken";
-  else if (isEV)
-    gotState = "EV";
-  else
-    gotState = "secure";
-
-  finish(gotState);
-}
-
-</script>
-</head>
-
-<body onload="onWindowLoad()">
- <h1>Security_state_child</h1>
-</body>
-</html>
-

testing/mochitest/Makefile.in

@@ -47,8 +47,6 @@ SERV_FILES = 	\
 		b2g-desktop.json \
 		b2g-debug.json \
 		b2g_start_script.js \
-		root-ev-tester.crl \
-		intermediate-ev-tester.crl \
 		$(NULL)	
 
 ifeq ($(MOZ_BUILD_APP),mobile/android)