diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 15:32:28 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 15:32:28 +0000 |
| commit | c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600 (patch) | |
| tree | c66897fd54bc3031c05a39f93d5e4d9486ace92d /net/third_party/nss/ssl/ssl3ext.c | |
| parent | ac9f9790f66dfc60f0759c8d44989aa6ebb3852f (diff) | |
| download | chromium_src-c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600.zip chromium_src-c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600.tar.gz chromium_src-c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600.tar.bz2 | |
Reshuffle some NSS code to make way for Snap Start.
TEST=net_unittests
BUG=none
http://codereview.chromium.org/3074008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/ssl3ext.c')
| -rw-r--r-- | net/third_party/nss/ssl/ssl3ext.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/third_party/nss/ssl/ssl3ext.c b/net/third_party/nss/ssl/ssl3ext.c index ead0cfd..b6d52fd 100644 --- a/net/third_party/nss/ssl/ssl3ext.c +++ b/net/third_party/nss/ssl/ssl3ext.c @@ -298,7 +298,7 @@ ssl3_ExtensionNegotiated(sslSocket *ss, PRUint16 ex_type) { xtnData->numNegotiated, ex_type); } -static PRBool +PRBool ssl3_ClientExtensionAdvertised(sslSocket *ss, PRUint16 ex_type) { TLSExtensionData *xtnData = &ss->xtnData; return arrayContainsExtension(xtnData->advertised, @@ -513,6 +513,8 @@ ssl3_SendSessionTicketXtn( rv = ssl3_AppendHandshakeVariable(ss, session_ticket->ticket.data, session_ticket->ticket.len, 2); ss->xtnData.ticketTimestampVerified = PR_FALSE; + if (!ss->sec.isServer) + ss->xtnData.clientSentNonEmptySessionTicket = PR_TRUE; } else { rv = ssl3_AppendHandshakeNumber(ss, 0, 2); } @@ -1019,7 +1021,7 @@ ssl3_ServerHandleSessionTicketXtn(sslSocket *ss, PRUint16 ex_type, * instead of terminating the current connection. */ if (data->len == 0) { - ss->xtnData.emptySessionTicket = PR_TRUE; + ss->xtnData.serverReceivedEmptySessionTicket = PR_TRUE; } else { int i; SECItem extension_data; |