Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: net/third_party/nss/ssl/ssl3gthr.c

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Gather (Read) entire SSL3 records from socket into buffer. 2 * Gather (Read) entire SSL3 records from socket into buffer.
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 /* $Id: ssl3gthr.c,v 1.14 2012/04/25 14:50:12 gerv%gerv.net Exp $ */ 7 /* $Id$ */
8 8
9 #include "cert.h" 9 #include "cert.h"
10 #include "ssl.h" 10 #include "ssl.h"
11 #include "sslimpl.h" 11 #include "sslimpl.h"
12 #include "ssl3prot.h" 12 #include "ssl3prot.h"
13 13
14 /* 14 /*
15 * Attempt to read in an entire SSL3 record. 15 * Attempt to read in an entire SSL3 record.
16 * Blocks here for blocking sockets, otherwise returns -1 with 16 * Blocks here for blocking sockets, otherwise returns -1 with
17 * PR_WOULD_BLOCK_ERROR when socket would block. 17 * PR_WOULD_BLOCK_ERROR when socket would block.
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 { 399 {
400 int rv; 400 int rv;
401 401
402 PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) ); 402 PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) );
403 do { 403 do {
404 rv = ssl3_GatherCompleteHandshake(ss, flags); 404 rv = ssl3_GatherCompleteHandshake(ss, flags);
405 } while (rv > 0 && ss->gs.buf.len == 0); 405 } while (rv > 0 && ss->gs.buf.len == 0);
406 406
407 return rv; 407 return rv;
408 } 408 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698