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

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

Issue 27589002: Support new ChannelID extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 7 years, 1 month 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/sslimpl.h ('k') | net/third_party/nss/ssl/sslt.h » ('j') | 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 * This file implements the CLIENT Session ID cache. 2 * This file implements the CLIENT Session ID cache.
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 7
8 #include "cert.h" 8 #include "cert.h"
9 #include "pk11pub.h" 9 #include "pk11pub.h"
10 #include "secitem.h" 10 #include "secitem.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 if ( sid->localCert ) { 142 if ( sid->localCert ) {
143 CERT_DestroyCertificate(sid->localCert); 143 CERT_DestroyCertificate(sid->localCert);
144 } 144 }
145 if (sid->u.ssl3.sessionTicket.ticket.data) { 145 if (sid->u.ssl3.sessionTicket.ticket.data) {
146 SECITEM_FreeItem(&sid->u.ssl3.sessionTicket.ticket, PR_FALSE); 146 SECITEM_FreeItem(&sid->u.ssl3.sessionTicket.ticket, PR_FALSE);
147 } 147 }
148 if (sid->u.ssl3.srvName.data) { 148 if (sid->u.ssl3.srvName.data) {
149 SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE); 149 SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE);
150 } 150 }
151 if (sid->u.ssl3.originalHandshakeHash.data) {
152 SECITEM_FreeItem(&sid->u.ssl3.originalHandshakeHash, PR_FALSE);
153 }
151 154
152 PORT_ZFree(sid, sizeof(sslSessionID)); 155 PORT_ZFree(sid, sizeof(sslSessionID));
153 } 156 }
154 157
155 /* BEWARE: This function gets called for both client and server SIDs !! 158 /* BEWARE: This function gets called for both client and server SIDs !!
156 * Decrement reference count, and 159 * Decrement reference count, and
157 * free sid if ref count is zero, and sid is not in the cache. 160 * free sid if ref count is zero, and sid is not in the cache.
158 * Does NOT remove from the cache first. 161 * Does NOT remove from the cache first.
159 * If the sid is still in the cache, it is left there until next time 162 * If the sid is still in the cache, it is left there until next time
160 * the cache list is traversed. 163 * the cache list is traversed.
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 sid->u.ssl3.sessionTicket.ticket.len = 0; 450 sid->u.ssl3.sessionTicket.ticket.len = 0;
448 } 451 }
449 sid->u.ssl3.sessionTicket.received_timestamp = 452 sid->u.ssl3.sessionTicket.received_timestamp =
450 session_ticket->received_timestamp; 453 session_ticket->received_timestamp;
451 sid->u.ssl3.sessionTicket.ticket_lifetime_hint = 454 sid->u.ssl3.sessionTicket.ticket_lifetime_hint =
452 session_ticket->ticket_lifetime_hint; 455 session_ticket->ticket_lifetime_hint;
453 456
454 UNLOCK_CACHE; 457 UNLOCK_CACHE;
455 return SECSuccess; 458 return SECSuccess;
456 } 459 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | net/third_party/nss/ssl/sslt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698