Bug 683449 - DigiNotar patch erroneously blocks one of the two Staat der Nederlanden roots; r=kaie

security/manager/ssl/src/nsNSSCallbacks.cpp

@@ -1071,8 +1071,10 @@ PSM_SSL_BlacklistDigiNotar(CERTCertificate * serverCert,
     }
 
     // By request of the Dutch government
-    if (!strcmp(node->cert->issuerName,
+    if ((!strcmp(node->cert->issuerName,
-                "CN=Staat der Nederlanden Root CA,O=Staat der Nederlanden,C=NL") &&
+                "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;
     }