Update net/third_party/nss to NSS 3.13.3.

net/third_party/nss/ssl/sslauth.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 15 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * 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 ***** */
-/* $Id: sslauth.c,v 1.16.66.1 2010/08/03 18:52:13 wtc%google.com Exp $ */
+/* $Id: sslauth.c,v 1.17 2010/08/03 18:48:45 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 #include "pk11func.h"
 
 /* NEED LOCKS IN HERE.  */
 CERTCertificate *
 SSL_PeerCertificate(PRFileDesc *fd)
 {
     sslSocket *ss;
 
     ss = ssl_FindSocket(fd);
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in PeerCertificate",
                  SSL_GETPID(), fd));
         return 0;
     }
     if (ss->opt.useSecurity && ss->sec.peerCert) {
         return CERT_DupCertificate(ss->sec.peerCert);
     }
     return 0;
 }
 
 /* NEED LOCKS IN HERE.  */
 SECStatus
 SSL_PeerCertificateChain(PRFileDesc *fd, CERTCertificate **certs,
-                         unsigned int *certsSize)
+                         unsigned int *numCerts, unsigned int maxNumCerts)
 {
     sslSocket *ss;
-    unsigned int inSize = *certsSize;
     ssl3CertNode* cur;
 
     ss = ssl_FindSocket(fd);
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in PeerCertificateChain",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
     if (!ss->opt.useSecurity)
         return SECFailure;
 
     if (ss->sec.peerCert == NULL) {
-      *certsSize = 0;
+      *numCerts = 0;
       return SECSuccess;
     }
 
-    *certsSize = 1;  /* for the leaf certificate */
-    if (inSize > 0)
+    *numCerts = 1;  /* for the leaf certificate */
+    if (maxNumCerts > 0)
         certs[0] = CERT_DupCertificate(ss->sec.peerCert);
 
     for (cur = ss->ssl3.peerCertChain; cur; cur = cur->next) {
-        if (*certsSize < inSize)
-            certs[*certsSize] = CERT_DupCertificate(cur->cert);
-        (*certsSize)++;
+        if (*numCerts < maxNumCerts)
+            certs[*numCerts] = CERT_DupCertificate(cur->cert);
+        (*numCerts)++;
     }
 
     return SECSuccess;
 }
 
-SECStatus
-SSL_SetPredictedPeerCertificates(PRFileDesc *fd, CERTCertificate **certs,
-                                 unsigned int numCerts)
-{
-    sslSocket *ss;
-    unsigned int i;
-
-    ss = ssl_FindSocket(fd);
-    if (!ss) {
-        SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetPredictedPeerCertificates",
-                 SSL_GETPID(), fd));
-        return SECFailure;
-    }
-
-    ss->ssl3.predictedCertChain =
-        PORT_NewArray(CERTCertificate*, numCerts + 1);
-    if (!ss->ssl3.predictedCertChain)
-        return SECFailure;      /* error code was set */
-    for (i = 0; i < numCerts; i++)
-        ss->ssl3.predictedCertChain[i] = CERT_DupCertificate(certs[i]);
-    ss->ssl3.predictedCertChain[numCerts] = NULL;
-
-    return SECSuccess;
-}
-
-PRBool
-SSL_CertChainDigestReceived(PRFileDesc *fd)
-{
-    sslSocket *ss;
-
-    ss = ssl_FindSocket(fd);
-    if (!ss) {
-        SSL_DBG(("%d: SSL[%d]: bad socket in SSL_CertChainDigestReceived",
-                 SSL_GETPID(), fd));
-        return SECFailure;
-    }
-
-    return ss->ssl3.cachedInfoCertChainDigestReceived;
-}
-
 /* NEED LOCKS IN HERE.  */
 CERTCertificate *
 SSL_LocalCertificate(PRFileDesc *fd)
 {
     sslSocket *ss;
 
     ss = ssl_FindSocket(fd);
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in PeerCertificate",
                  SSL_GETPID(), fd));
@@ skipping 221 matching lines @@
     hostname = ss->url;
     if (hostname && hostname[0])
         rv = CERT_VerifyCertName(ss->sec.peerCert, hostname);
     else 
         rv = SECFailure;
     if (rv != SECSuccess)
         PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
 
     return rv;
 }