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

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

Issue 2808075: Update the TLS False Start patch. Replace TABs by spaces... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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
« no previous file with comments | « net/third_party/nss/ssl/ssl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * SSL3 Protocol 2 * SSL3 Protocol
3 * 3 *
4 * ***** BEGIN LICENSE BLOCK ***** 4 * ***** BEGIN LICENSE BLOCK *****
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
6 * 6 *
7 * The contents of this file are subject to the Mozilla Public License Version 7 * The contents of this file are subject to the Mozilla Public License Version
8 * 1.1 (the "License"); you may not use this file except in compliance with 8 * 1.1 (the "License"); you may not use this file except in compliance with
9 * the License. You may obtain a copy of the License at 9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/ 10 * http://www.mozilla.org/MPL/
(...skipping 5730 matching lines...) Expand 10 before | Expand all | Expand 10 after
5741 goto loser; /* err code was set. */ 5741 goto loser; /* err code was set. */
5742 } 5742 }
5743 5743
5744 ssl_ReleaseXmitBufLock(ss); /*******************************/ 5744 ssl_ReleaseXmitBufLock(ss); /*******************************/
5745 5745
5746 if (ssl3_ExtensionNegotiated(ss, ssl_session_ticket_xtn)) 5746 if (ssl3_ExtensionNegotiated(ss, ssl_session_ticket_xtn))
5747 ss->ssl3.hs.ws = wait_new_session_ticket; 5747 ss->ssl3.hs.ws = wait_new_session_ticket;
5748 else 5748 else
5749 ss->ssl3.hs.ws = wait_change_cipher; 5749 ss->ssl3.hs.ws = wait_change_cipher;
5750 5750
5751 /* Do the handshake callback for sslv3 here. */ 5751 /* Do the handshake callback for sslv3 here, if we can false start. */
5752 if (ss->handshakeCallback != NULL && ssl3_CanFalseStart(ss)) { 5752 if (ss->handshakeCallback != NULL && ssl3_CanFalseStart(ss)) {
5753 (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData); 5753 (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData);
5754 } 5754 }
5755 5755
5756 return SECSuccess; 5756 return SECSuccess;
5757 5757
5758 loser: 5758 loser:
5759 ssl_ReleaseXmitBufLock(ss); 5759 ssl_ReleaseXmitBufLock(ss);
5760 return rv; 5760 return rv;
5761 } 5761 }
(...skipping 2801 matching lines...) Expand 10 before | Expand all | Expand 10 after
8563 8563
8564 /* If the wrap failed, we don't cache the sid. 8564 /* If the wrap failed, we don't cache the sid.
8565 * The connection continues normally however. 8565 * The connection continues normally however.
8566 */ 8566 */
8567 if (rv == SECSuccess) { 8567 if (rv == SECSuccess) {
8568 (*ss->sec.cache)(sid); 8568 (*ss->sec.cache)(sid);
8569 } 8569 }
8570 } 8570 }
8571 ss->ssl3.hs.ws = idle_handshake; 8571 ss->ssl3.hs.ws = idle_handshake;
8572 8572
8573 /* Do the handshake callback for sslv3 here. */ 8573 /* Do the handshake callback for sslv3 here, if we cannot false start. */
8574 if (ss->handshakeCallback != NULL && !ssl3_CanFalseStart(ss)) { 8574 if (ss->handshakeCallback != NULL && !ssl3_CanFalseStart(ss)) {
8575 (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData); 8575 (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData);
8576 } 8576 }
8577 8577
8578 return SECSuccess; 8578 return SECSuccess;
8579 } 8579 }
8580 8580
8581 /* Called from ssl3_HandleHandshake() when it has gathered a complete ssl3 8581 /* Called from ssl3_HandleHandshake() when it has gathered a complete ssl3
8582 * hanshake message. 8582 * hanshake message.
8583 * Caller must hold Handshake and RecvBuf locks. 8583 * Caller must hold Handshake and RecvBuf locks.
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
9561 9561
9562 ss->ssl3.initialized = PR_FALSE; 9562 ss->ssl3.initialized = PR_FALSE;
9563 9563
9564 if (ss->ssl3.nextProto.data) { 9564 if (ss->ssl3.nextProto.data) {
9565 PORT_Free(ss->ssl3.nextProto.data); 9565 PORT_Free(ss->ssl3.nextProto.data);
9566 ss->ssl3.nextProto.data = NULL; 9566 ss->ssl3.nextProto.data = NULL;
9567 } 9567 }
9568 } 9568 }
9569 9569
9570 /* End of ssl3con.c */ 9570 /* End of ssl3con.c */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/ssl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698