Update NSS to NSS 3.13.4 pre-release snapshot 20120319.

net/third_party/nss/ssl/sslgathr.c

 /*
  * Gather (Read) entire SSL2 records from socket into buffer.  
  *
  * ***** 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/
@@ skipping 18 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: sslgathr.c,v 1.12 2010/04/25 23:37:38 nelson%bolyard.com Exp $ */
+/* $Id: sslgathr.c,v 1.13 2012/03/11 04:32:35 wtc%google.com Exp $ */
 #include "cert.h"
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 
 /* Forward static declarations */
 static SECStatus ssl2_HandleV3HandshakeRecord(sslSocket *ss);
 
 /*
 ** Gather a single record of data from the receiving stream. This code
@@ skipping 84 matching lines @@
         gs->offset    += nb;
         gs->remainder -= nb;
 
         if (gs->remainder > 0) {
             continue;
         }
 
         /* Probably finished this piece */
         switch (gs->state) {
         case GS_HEADER: 
-            if ((ss->opt.enableSSL3 || ss->opt.enableTLS) && !ss->firstHsDone) {
+            if (!SSL3_ALL_VERSIONS_DISABLED(&ss->vrange) && !ss->firstHsDone) {
 
                 PORT_Assert( ss->opt.noLocks || ssl_Have1stHandshakeLock(ss) );
 
                 /* If this looks like an SSL3 handshake record, 
                 ** and we're expecting an SSL2 Hello message from our peer, 
                 ** handle it here.
                 */
                 if (gs->hdr[0] == content_handshake) {
                     if ((ss->nextHandshake == ssl2_HandleClientHelloMessage) ||
                         (ss->nextHandshake == ssl2_HandleServerHelloMessage)) {
@@ skipping 23 matching lines @@
                 } else if (gs->hdr[0] == content_alert) {
                     if (ss->nextHandshake == ssl2_HandleServerHelloMessage) {
                         /* XXX This is a hack.  We're assuming that any failure
                          * XXX on the client hello is a failure to match
                          * XXX ciphers.
                          */
                         PORT_SetError(SSL_ERROR_NO_CYPHER_OVERLAP);
                         return SECFailure;
                     }
                 }
-            }   /* ((ss->opt.enableSSL3 || ss->opt.enableTLS) && !ss->firstHsDone) */
+            }
 
             /* we've got the first 3 bytes.  The header may be two or three. */
             if (gs->hdr[0] & 0x80) {
                 /* This record has a 2-byte header, and no padding */
                 gs->count = ((gs->hdr[0] & 0x7f) << 8) | gs->hdr[1];
                 gs->recordPadding = 0;
             } else {
                 /* This record has a 3-byte header that is all read in now. */
                 gs->count = ((gs->hdr[0] & 0x3f) << 8) | gs->hdr[1];
             /*  is_escape =  (gs->hdr[0] & 0x40) != 0; */
@@ skipping 247 matching lines @@
         PORT_ZFree(gs->buf.buf, gs->buf.space);
         PORT_Free(gs->inbuf.buf);
     }
 }
 
 /* Caller must hold RecvBufLock. */
 static SECStatus
 ssl2_HandleV3HandshakeRecord(sslSocket *ss)
 {
     SECStatus           rv;
-    SSL3ProtocolVersion version = (ss->gs.hdr[1] << 8) | ss->gs.hdr[2];
 
     PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) );
     PORT_Assert( ss->opt.noLocks || ssl_Have1stHandshakeLock(ss) );
 
     /* We've read in 3 bytes, there are 2 more to go in an ssl3 header. */
     ss->gs.remainder         = 2;
     ss->gs.count             = 0;
 
     /* Clearing these handshake pointers ensures that 
      * ssl_Do1stHandshake won't call ssl2_HandleMessage when we return.
      */
     ss->nextHandshake     = 0;
     ss->securityHandshake = 0;
 
     /* Setting ss->version to an SSL 3.x value will cause 
     ** ssl_GatherRecord1stHandshake to invoke ssl3_GatherCompleteHandshake() 
     ** the next time it is called.
     **/
-    rv = ssl3_NegotiateVersion(ss, version);
+    rv = ssl3_NegotiateVersion(ss, SSL_LIBRARY_VERSION_MAX_SUPPORTED,
+                               PR_TRUE);
     if (rv != SECSuccess) {
         return rv;
     }
 
     ss->sec.send         = ssl3_SendApplicationData;
 
     return SECSuccess;
 }