Update to NSS 3.12.9. falsestart.patch, falsestart2.patch, and...

net/third_party/nss/ssl/sslsecur.c

 /*
  * Various SSL functions.
  *
  * ***** 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 19 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: sslsecur.c,v 1.43 2010/01/14 22:15:25 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslsecur.c,v 1.43.2.2 2010/08/26 18:06:55 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "keyhi.h"
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 #include "secoid.h"     /* for SECOID_GetALgorithmTag */
 #include "pk11func.h"   /* for PK11_GenerateRandom */
 #include "nss.h"        /* for NSS_RegisterShutdown */
 #include "prinit.h"     /* for PR_CallOnceWithArg */
@@ skipping 1305 matching lines @@
 */
 int
 SSL_DataPending(PRFileDesc *fd)
 {
     sslSocket *ss;
     int        rv  = 0;
 
     ss = ssl_FindSocket(fd);
 
     if (ss && ss->opt.useSecurity) {
-
-        ssl_Get1stHandshakeLock(ss);
-        ssl_GetSSL3HandshakeLock(ss);
-
         ssl_GetRecvBufLock(ss);
         rv = ss->gs.writeOffset - ss->gs.readOffset;
         ssl_ReleaseRecvBufLock(ss);
-
-        ssl_ReleaseSSL3HandshakeLock(ss);
-        ssl_Release1stHandshakeLock(ss);
     }
 
     return rv;
 }
 
 SECStatus
 SSL_InvalidateSession(PRFileDesc *fd)
 {
     sslSocket *   ss = ssl_FindSocket(fd);
     SECStatus     rv = SECFailure;
@@ skipping 144 matching lines @@
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SNISocketConfigHook",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     ss->sniSocketConfig = func;
     ss->sniSocketConfigArg = arg;
     return SECSuccess;
 }