Update libssl to NSS 3.18 RTM

net/third_party/nss/ssl/sslgathr.c

 /*
  * Gather (Read) entire SSL2 records from socket into buffer.  
  *
  * 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 "cert.h"
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
@@ skipping 346 matching lines @@
  * Called by ssl_GatherRecord1stHandshake in sslcon.c, 
  * and by DoRecv in sslsecur.c
  * Caller must hold RecvBufLock.
  */
 int 
 ssl2_GatherRecord(sslSocket *ss, int flags)
 {
     return ssl2_GatherData(ss, &ss->gs, flags);
 }
 
-/*
- * Returns +1 when it has gathered a complete SSLV2 record.
- * Returns  0 if it hits EOF.
- * Returns -1 (SECFailure)    on any error
- * Returns -2 (SECWouldBlock) 
- *
- * Called from SocksStartGather in sslsocks.c
- * Caller must hold RecvBufLock. 
- */
-int 
-ssl2_StartGatherBytes(sslSocket *ss, sslGather *gs, unsigned int count)
-{
-    int rv;
-
-    PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) );
-    gs->state     = GS_DATA;
-    gs->remainder = count;
-    gs->count     = count;
-    gs->offset    = 0;
-    if (count > gs->buf.space) {
-        rv = sslBuffer_Grow(&gs->buf, count);
-        if (rv) {
-            return rv;
-        }
-    }
-    return ssl2_GatherData(ss, gs, 0);
-}
-
 /* Caller should hold RecvBufLock. */
 SECStatus
 ssl_InitGather(sslGather *gs)
 {
     SECStatus status;
 
     gs->state = GS_INIT;
     gs->writeOffset = 0;
     gs->readOffset  = 0;
     gs->dtlsPacketOffset = 0;
@@ skipping 39 matching lines @@
     rv = ssl3_NegotiateVersion(ss, SSL_LIBRARY_VERSION_MAX_SUPPORTED,
                                PR_TRUE);
     if (rv != SECSuccess) {
         return rv;
     }
 
     ss->sec.send         = ssl3_SendApplicationData;
 
     return SECSuccess;
 }