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

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

Issue 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 5 years, 8 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
« no previous file with comments | « net/third_party/nss/ssl/sslsecur.c ('k') | net/third_party/nss/ssl/sslsock.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This file implements the SERVER Session ID cache. 1 /* This file implements the SERVER Session ID cache.
2 * NOTE: The contents of this file are NOT used by the client. 2 * NOTE: The contents of this file are NOT used by the client.
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 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 8 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server
9 * cache sids! 9 * cache sids!
10 * 10 *
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 "cipherSuite=%d", 515 "cipherSuite=%d",
516 myPid, to->creationTime, to->addr.pr_s6_addr32[0], 516 myPid, to->creationTime, to->addr.pr_s6_addr32[0],
517 to->addr.pr_s6_addr32[1], to->addr.pr_s6_addr32[2], 517 to->addr.pr_s6_addr32[1], to->addr.pr_s6_addr32[2],
518 to->addr.pr_s6_addr32[3], to->u.ssl3.cipherSuite)); 518 to->addr.pr_s6_addr32[3], to->u.ssl3.cipherSuite));
519 } 519 }
520 } 520 }
521 521
522 /* 522 /*
523 ** Convert shared memory cache-entry to local memory based one 523 ** Convert shared memory cache-entry to local memory based one
524 ** This is only called from ServerSessionIDLookup(). 524 ** This is only called from ServerSessionIDLookup().
525 ** Caller must hold cache lock when calling this.
526 */ 525 */
527 static sslSessionID * 526 static sslSessionID *
528 ConvertToSID(sidCacheEntry * from, 527 ConvertToSID(sidCacheEntry * from,
529 certCacheEntry * pcce, 528 certCacheEntry * pcce,
530 srvNameCacheEntry *psnce, 529 srvNameCacheEntry *psnce,
531 CERTCertDBHandle * dbHandle) 530 CERTCertDBHandle * dbHandle)
532 { 531 {
533 sslSessionID *to; 532 sslSessionID *to;
534 PRUint16 version = from->version; 533 PRUint16 version = from->version;
535 534
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
2204 } 2203 }
2205 2204
2206 SECStatus 2205 SECStatus
2207 SSL_SetMaxServerCacheLocks(PRUint32 maxLocks) 2206 SSL_SetMaxServerCacheLocks(PRUint32 maxLocks)
2208 { 2207 {
2209 PR_ASSERT(!"SSL servers are not supported on this platform. (SSL_SetMaxServe rCacheLocks)"); 2208 PR_ASSERT(!"SSL servers are not supported on this platform. (SSL_SetMaxServe rCacheLocks)");
2210 return SECFailure; 2209 return SECFailure;
2211 } 2210 }
2212 2211
2213 #endif /* XP_UNIX || XP_WIN32 */ 2212 #endif /* XP_UNIX || XP_WIN32 */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslsecur.c ('k') | net/third_party/nss/ssl/sslsock.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698