Merge for backout of bug 479393
authorDave Camp <dcamp@mozilla.com>
Wed, 25 Feb 2009 21:51:00 -0800
changeset 25532 63e4495a9b1e8f45f728f122049a7ba4083422cd
parent 25530 0fa543fc5ed5ea14bd72cbfa021cf7ebe115a0ba (current diff)
parent 25531 939103e7a4abcecf6035ba8ff205410c958e4ec1 (diff)
child 25533 39a65a31eb930c3b2db44044e4a56c30e1190c0e
push id5595
push userdcamp@mozilla.com
push dateThu, 26 Feb 2009 05:51:42 +0000
treeherdermozilla-central@63e4495a9b1e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs479393
milestone1.9.2a1pre
Merge for backout of bug 479393
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -1573,21 +1573,16 @@ nsNSSComponent::InitializeNSS(PRBool sho
     } // lock
 
     // init phase 3, only if phase 2 was successful
 
     if (problem_no_security_at_all != which_nss_problem) {
 
       mNSSInitialized = PR_TRUE;
 
-      // Make the old cert validation APIs (CERT_VerifyCert and
-      // CERT_VerifyCertificate) use the new libpkix cert validation engine.
-      // Eventually PSM should switch to the new CERT_PKIXVerifyCert function.
-      CERT_SetUsePKIXForValidation(PR_TRUE);
-
       ::NSS_SetDomesticPolicy();
       //  SSL_EnableCipher(SSL_RSA_WITH_NULL_MD5, SSL_ALLOWED);
       //  SSL_EnableCipher(SSL_RSA_WITH_NULL_SHA, SSL_ALLOWED);
 
       PK11_SetPasswordFunc(PK11PasswordPrompt);
 
       // Register an observer so we can inform NSS when these prefs change
       nsCOMPtr<nsIPrefBranch2> pbi = do_QueryInterface(mPrefBranch);