Fix imported server certs being distrusted in NSS 3.13.

net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 194 matching lines @@
               PR_FALSE, PR_FALSE);
   SetEmailTrust(PR_FALSE, PR_FALSE,
                 PR_TRUE, PR_TRUE, PR_TRUE,
                 PR_FALSE, PR_FALSE);
   SetObjSignTrust(PR_FALSE, PR_FALSE,
                   PR_TRUE, PR_TRUE, PR_TRUE,
                   PR_FALSE, PR_FALSE);
 }
 
 void 
-nsNSSCertTrust::SetValidPeer()
+nsNSSCertTrust::SetTerminalRecord()
 {
   SetSSLTrust(PR_TRUE, PR_FALSE,
               PR_FALSE, PR_FALSE, PR_FALSE,
               PR_FALSE, PR_FALSE);
   SetEmailTrust(PR_TRUE, PR_FALSE,
                 PR_FALSE, PR_FALSE, PR_FALSE,
                 PR_FALSE, PR_FALSE);
   SetObjSignTrust(PR_TRUE, PR_FALSE,
                   PR_FALSE, PR_FALSE, PR_FALSE,
                   PR_FALSE, PR_FALSE);
 }
 
 void 
-nsNSSCertTrust::SetValidServerPeer()
+nsNSSCertTrust::SetTerminalServerRecord()
 {
   SetSSLTrust(PR_TRUE, PR_FALSE,
               PR_FALSE, PR_FALSE, PR_FALSE,
               PR_FALSE, PR_FALSE);
   SetEmailTrust(PR_FALSE, PR_FALSE,
                 PR_FALSE, PR_FALSE, PR_FALSE,
                 PR_FALSE, PR_FALSE);
   SetObjSignTrust(PR_FALSE, PR_FALSE,
                   PR_FALSE, PR_FALSE, PR_FALSE,
                   PR_FALSE, PR_FALSE);
@@ skipping 45 matching lines @@
   if (checkSSL && !hasTrust(mTrust.sslFlags, CERTDB_VALID_CA))
     return PR_FALSE;
   if (checkEmail && !hasTrust(mTrust.emailFlags, CERTDB_VALID_CA))
     return PR_FALSE;
   if (checkObjSign && !hasTrust(mTrust.objectSigningFlags, CERTDB_VALID_CA))
     return PR_FALSE;
   return PR_TRUE;
 }
 
 PRBool
-nsNSSCertTrust::HasPeer(PRBool checkSSL, 
-                        PRBool checkEmail,  
-                        PRBool checkObjSign)
+nsNSSCertTrust::HasTerminalRecord(PRBool checkSSL, 
+                                  PRBool checkEmail,  
+                                  PRBool checkObjSign)
 {
   if (checkSSL && !hasTrust(mTrust.sslFlags, CERTDB_TERMINAL_RECORD))
     return PR_FALSE;
   if (checkEmail && !hasTrust(mTrust.emailFlags, CERTDB_TERMINAL_RECORD))
     return PR_FALSE;
   if (checkObjSign &&
        !hasTrust(mTrust.objectSigningFlags, CERTDB_TERMINAL_RECORD))
     return PR_FALSE;
   return PR_TRUE;
 }
@@ skipping 61 matching lines @@
   *t |= v;
 }
 
 PRBool
 nsNSSCertTrust::hasTrust(unsigned int t, unsigned int v)
 {
   return !!(t & v);
 }
 
 }  // namespace mozilla_security_manager