Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/certdb/certdb.c

 /* ***** 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 21 matching lines @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * Certificate handling code
  *
- * $Id: certdb.c,v 1.102 2010/02/10 02:00:57 wtc%google.com Exp $
+ * $Id: certdb.c,v 1.104 2010/04/25 00:44:55 nelson%bolyard.com Exp $
  */
 
 #include "nssilock.h"
 #include "prmon.h"
 #include "prtime.h"
 #include "cert.h"
 #include "certi.h"
 #include "secder.h"
 #include "secoid.h"
 #include "secasn1.h"
@@ skipping 509 matching lines @@
     PRUint32 nsCertType;
 
     if (cert->nsCertType) {
         /* once set, no need to recalculate */
         return SECSuccess;
     }
     nsCertType = cert_ComputeCertType(cert);
 
     /* Assert that it is safe to cast &cert->nsCertType to "PRInt32 *" */
     PORT_Assert(sizeof(cert->nsCertType) == sizeof(PRInt32));
-    PR_AtomicSet((PRInt32 *)&cert->nsCertType, nsCertType);
+    PR_ATOMIC_SET((PRInt32 *)&cert->nsCertType, nsCertType);
     return SECSuccess;
 }
 
 PRUint32
 cert_ComputeCertType(CERTCertificate *cert)
 {
     SECStatus rv;
     SECItem tmpitem;
     SECItem encodedExtKeyUsage;
     CERTOidSequence *extKeyUsage = NULL;
@@ skipping 1239 matching lines @@
           return nickNames;
         }
 
         /* failure to produce output */
         PORT_FreeArena(arena, PR_FALSE);
         return NULL;
       }
     }
 
     /* no SAN extension or no names found in extension */
-    /* now try the NS cert name extension first, then the common name */
-    singleName = 
-      CERT_FindNSStringExtension(cert, SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME);
-    if (!singleName) {
-      singleName = CERT_GetCommonName(&cert->subject);
-    }
-
+    singleName = CERT_GetCommonName(&cert->subject);
     if (singleName) {
       nickNames->numnicknames = 1;
       nickNames->nicknames = PORT_ArenaAlloc(arena, sizeof(char *));
       if (nickNames->nicknames) {
         *nickNames->nicknames = PORT_ArenaStrdup(arena, singleName);
       }
       PORT_Free(singleName);
 
       /* Did we allocate both the buffer of pointers and the string? */
       if (nickNames->nicknames && *nickNames->nicknames) {
@@ skipping 28 matching lines @@
         }
     }
 
     /* Per RFC 2818, if the SubjectAltName extension is present, it must
     ** be used as the cert's identity.
     */
     rv = cert_VerifySubjectAltName(cert, hn);
     if (rv == SECSuccess || PORT_GetError() != SEC_ERROR_EXTENSION_NOT_FOUND)
         return rv;
 
-    /* try the cert extension first, then the common name */
-    cn = CERT_FindNSStringExtension(cert, SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME);
-    if ( !cn ) {
-        cn = CERT_GetCommonName(&cert->subject);
-    }
+    cn = CERT_GetCommonName(&cert->subject);
     if ( cn ) {
         rv = cert_TestHostName(cn, hn);
         PORT_Free(cn);
     } else 
         PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
     return rv;
 }
 
 PRBool
 CERT_CompareCerts(CERTCertificate *c1, CERTCertificate *c2)
@@ skipping 1335 matching lines @@
     CERTCertificate *cert = NULL;
     SECItem *derCert;
 
     derCert = cert_FindDERCertBySubjectKeyID(subjKeyID);
     if (derCert) {
         cert = CERT_FindCertByDERCert(handle, derCert);
         SECITEM_FreeItem(derCert, PR_TRUE);
     }
     return cert;
 }