Bug 683449 - Remove the exemptions for the Staat der Nederlanden root; rs=LegNeato CLOSED TREE a=release CAMINO_2_1_B2_MINIBRANCH
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 02 Sep 2011 13:53:47 -0400
branchCAMINO_2_1_B2_MINIBRANCH
changeset 35179 7657929691712397b3f23b1ccd8273da6e0fe0c3
parent 35160 8f8eaf82ecc2ec480ed4452941eac36e774ad640
child 35180 0da0036974e10043039bd6631910b91a113637c7
push id1971
push useralqahira@ardisson.org
push dateThu, 08 Sep 2011 04:55:20 +0000
reviewersLegNeato, release
bugs683449
milestone1.9.2.22
Bug 683449 - Remove the exemptions for the Staat der Nederlanden root; rs=LegNeato CLOSED TREE a=release
security/manager/ssl/src/nsNSSCallbacks.cpp
--- a/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -1028,25 +1028,16 @@ PSM_SSL_BlacklistDigiNotar(CERTCertifica
         NS_ASSERTION(status == PR_SUCCESS, "PR_ParseTimeString failed");
         if (status != PR_SUCCESS ||
            CERT_GetCertTimes(serverCert, &notBefore, &notAfter) != SECSuccess ||
            notBefore >= cutoff) {
           return SEC_ERROR_REVOKED_CERTIFICATE;
         }
       }
     }
-
-    // By request of the Dutch government
-    if ((!strcmp(node->cert->issuerName,
-                "CN=Staat der Nederlanden Root CA,O=Staat der Nederlanden,C=NL") ||
-         !strcmp(node->cert->issuerName,
-                "CN=Staat der Nederlanden Root CA - G2,O=Staat der Nederlanden,C=NL")) &&
-        CERT_LIST_END(CERT_LIST_NEXT(node), serverCertChain)) {
-      return 0;
-    }
   }
 
   if (isDigiNotarIssuedCert)
     return SEC_ERROR_UNTRUSTED_ISSUER; // user can override this
   else
     return 0; // No DigiNotor cert => carry on as normal
 }