Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/certhigh/certhigh.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "nspr.h"
 #include "secerr.h"
 #include "secasn1.h"
 #include "seccomon.h"
 #include "pk11func.h"
 #include "certdb.h"
 #include "certt.h"
@@ skipping 524 matching lines @@
     PORT_FreeArena(names->arena, PR_FALSE);
     
     return;
 }
 
 static SECStatus
 CollectDistNames( CERTCertificate *cert, SECItem *k, void *data)
 {
     CERTDistNames *names;
     PRBool saveit = PR_FALSE;
-    CERTCertTrust *trust;
+    CERTCertTrust trust;
     dnameNode *node;
     int len;
     
     names = (CERTDistNames *)data;
     
-    if ( cert->trust ) {
-        trust = cert->trust;
-        
+    if ( CERT_GetCertTrust(cert, &trust) == SECSuccess ) {
         /* only collect names of CAs trusted for issuing SSL clients */
-        if (  trust->sslFlags &  CERTDB_TRUSTED_CLIENT_CA )  {
+        if (  trust.sslFlags &  CERTDB_TRUSTED_CLIENT_CA )  {
             saveit = PR_TRUE;
         }
     }
 
     if ( saveit ) {
         /* allocate the node */
         node = (dnameNode*)PORT_ArenaAlloc(names->arena, sizeof(dnameNode));
         if ( node == NULL ) {
             return(SECFailure);
         }
@@ skipping 620 matching lines @@
     }
     return NULL;
 }
 
 void
 CERT_DestroyCertificateList(CERTCertificateList *list)
 {
     PORT_FreeArena(list->arena, PR_FALSE);
 }