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

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

Issue 2828002: Support for using OS-native certificates for SSL client auth.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Add a short-circuit when the CSP reports the container is not removable Created 10 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/sslplatf.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 * ***** 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 to->u.ssl3.masterSlotID = (CK_SLOT_ID)-1; /* invalid value */ 631 to->u.ssl3.masterSlotID = (CK_SLOT_ID)-1; /* invalid value */
632 to->u.ssl3.masterWrapIndex = 0; 632 to->u.ssl3.masterWrapIndex = 0;
633 to->u.ssl3.masterWrapSeries = 0; 633 to->u.ssl3.masterWrapSeries = 0;
634 to->u.ssl3.masterValid = PR_FALSE; 634 to->u.ssl3.masterValid = PR_FALSE;
635 635
636 to->u.ssl3.clAuthModuleID = (SECMODModuleID)-1; /* invalid value */ 636 to->u.ssl3.clAuthModuleID = (SECMODModuleID)-1; /* invalid value */
637 to->u.ssl3.clAuthSlotID = (CK_SLOT_ID)-1; /* invalid value */ 637 to->u.ssl3.clAuthSlotID = (CK_SLOT_ID)-1; /* invalid value */
638 to->u.ssl3.clAuthSeries = 0; 638 to->u.ssl3.clAuthSeries = 0;
639 to->u.ssl3.clAuthValid = PR_FALSE; 639 to->u.ssl3.clAuthValid = PR_FALSE;
640 640
641 #ifdef NSS_PLATFORM_CLIENT_AUTH
642 ssl_InitPlatformAuthInfo(&to->u.ssl3.clPlatformAuthInfo);
643 to->u.ssl3.clPlatformAuthValid = PR_FALSE;
644 #endif /* NSS_PLATFORM_CLIENT_AUTH */
645
641 if (from->u.ssl3.certIndex != -1 && pcce) { 646 if (from->u.ssl3.certIndex != -1 && pcce) {
642 SECItem derCert; 647 SECItem derCert;
643 648
644 derCert.len = pcce->certLength; 649 derCert.len = pcce->certLength;
645 derCert.data = pcce->cert; 650 derCert.data = pcce->cert;
646 651
647 to->peerCert = CERT_NewTempCertificate(dbHandle, &derCert, NULL, 652 to->peerCert = CERT_NewTempCertificate(dbHandle, &derCert, NULL,
648 PR_FALSE, PR_TRUE); 653 PR_FALSE, PR_TRUE);
649 if (to->peerCert == NULL) 654 if (to->peerCert == NULL)
650 goto loser; 655 goto loser;
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after
2153 } 2158 }
2154 2159
2155 SECStatus 2160 SECStatus
2156 SSL_SetMaxServerCacheLocks(PRUint32 maxLocks) 2161 SSL_SetMaxServerCacheLocks(PRUint32 maxLocks)
2157 { 2162 {
2158 PR_ASSERT(!"SSL servers are not supported on this platform. (SSL_SetMaxServe rCacheLocks)"); 2163 PR_ASSERT(!"SSL servers are not supported on this platform. (SSL_SetMaxServe rCacheLocks)");
2159 return SECFailure; 2164 return SECFailure;
2160 } 2165 }
2161 2166
2162 #endif /* XP_UNIX || XP_WIN32 */ 2167 #endif /* XP_UNIX || XP_WIN32 */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslplatf.c ('k') | net/third_party/nss/ssl/sslsock.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698