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

Side by Side Diff: net/third_party/nss/ssl/sslgathr.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 SSL2 records from socket into buffer. 2 * Gather (Read) entire SSL2 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: sslgathr.c,v 1.15 2012/04/25 14:50:12 gerv%gerv.net Exp $ */ 7 /* $Id$ */
8 #include "cert.h" 8 #include "cert.h"
9 #include "ssl.h" 9 #include "ssl.h"
10 #include "sslimpl.h" 10 #include "sslimpl.h"
11 #include "sslproto.h" 11 #include "sslproto.h"
12 12
13 /* Forward static declarations */ 13 /* Forward static declarations */
14 static SECStatus ssl2_HandleV3HandshakeRecord(sslSocket *ss); 14 static SECStatus ssl2_HandleV3HandshakeRecord(sslSocket *ss);
15 15
16 /* 16 /*
17 ** Gather a single record of data from the receiving stream. This code 17 ** Gather a single record of data from the receiving stream. This code
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 rv = ssl3_NegotiateVersion(ss, SSL_LIBRARY_VERSION_MAX_SUPPORTED, 445 rv = ssl3_NegotiateVersion(ss, SSL_LIBRARY_VERSION_MAX_SUPPORTED,
446 PR_TRUE); 446 PR_TRUE);
447 if (rv != SECSuccess) { 447 if (rv != SECSuccess) {
448 return rv; 448 return rv;
449 } 449 }
450 450
451 ss->sec.send = ssl3_SendApplicationData; 451 ss->sec.send = ssl3_SendApplicationData;
452 452
453 return SECSuccess; 453 return SECSuccess;
454 } 454 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698