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

Side by Side Diff: net/third_party/nss/ssl/ssl.h

Issue 11359197: Ensure the patched NSS libssl used on Win and Mac behaves the same as upstream when handling client… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update patch Created 8 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/patches/clientauth.patch ('k') | net/third_party/nss/ssl/ssl3con.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 /* 1 /*
2 * This file contains prototypes for the public SSL functions. 2 * This file contains prototypes for the public SSL functions.
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 /* $Id: ssl.h,v 1.59 2012/09/21 21:58:43 wtc%google.com Exp $ */ 7 /* $Id: ssl.h,v 1.59 2012/09/21 21:58:43 wtc%google.com Exp $ */
8 8
9 #ifndef __ssl_h_ 9 #ifndef __ssl_h_
10 #define __ssl_h_ 10 #define __ssl_h_
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 PRFileDesc *fd, 534 PRFileDesc *fd,
535 CERTDistNames *caNames, 535 CERTDistNames *caNames,
536 CERTCertList **pRetCerts,/*return */ 536 CERTCertList **pRetCerts,/*return */
537 void **pRetKey,/* return */ 537 void **pRetKey,/* return */
538 CERTCertificate **pRetNSSCert,/*return */ 538 CERTCertificate **pRetNSSCert,/*return */
539 SECKEYPrivateKey **pRetNSSKey);/* return */ 539 SECKEYPrivateKey **pRetNSSKey);/* return */
540 540
541 /* 541 /*
542 * Set the client side callback for SSL to retrieve user's private key 542 * Set the client side callback for SSL to retrieve user's private key
543 * and certificate. 543 * and certificate.
544 * Note: If a platform client auth callback is set, the callback configured by
545 * SSL_GetClientAuthDataHook, if any, will not be called.
546 *
544 * fd - the file descriptor for the connection in question 547 * fd - the file descriptor for the connection in question
545 * f - the application's callback that delivers the key and cert 548 * f - the application's callback that delivers the key and cert
546 * a - application specific data 549 * a - application specific data
547 */ 550 */
548 SSL_IMPORT SECStatus 551 SSL_IMPORT SECStatus
549 SSL_GetPlatformClientAuthDataHook(PRFileDesc *fd, 552 SSL_GetPlatformClientAuthDataHook(PRFileDesc *fd,
550 SSLGetPlatformClientAuthData f, void *a); 553 SSLGetPlatformClientAuthData f, void *a);
551 554
552 /* 555 /*
553 ** SNI extension processing callback function. 556 ** SNI extension processing callback function.
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 * should continue using the connection. If the application passes a non-zero 1070 * should continue using the connection. If the application passes a non-zero
1068 * value for second argument (error), or if SSL_AuthCertificateComplete returns 1071 * value for second argument (error), or if SSL_AuthCertificateComplete returns
1069 * anything other than SECSuccess, then the application should close the 1072 * anything other than SECSuccess, then the application should close the
1070 * connection. 1073 * connection.
1071 */ 1074 */
1072 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd, 1075 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd,
1073 PRErrorCode error); 1076 PRErrorCode error);
1074 SEC_END_PROTOS 1077 SEC_END_PROTOS
1075 1078
1076 #endif /* __ssl_h_ */ 1079 #endif /* __ssl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/clientauth.patch ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698