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

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

Issue 10540014: nss: support SECWouldBlock from ChannelID callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is PRIVATE to SSL and should be the first thing included by 2 * This file is PRIVATE to SSL and should be the first thing included by
3 * any SSL implementation file. 3 * any SSL implementation file.
4 * 4 *
5 * ***** BEGIN LICENSE BLOCK ***** 5 * ***** BEGIN LICENSE BLOCK *****
6 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 6 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
7 * 7 *
8 * The contents of this file are subject to the Mozilla Public License Version 8 * The contents of this file are subject to the Mozilla Public License Version
9 * 1.1 (the "License"); you may not use this file except in compliance with 9 * 1.1 (the "License"); you may not use this file except in compliance with
10 * the License. You may obtain a copy of the License at 10 * the License. You may obtain a copy of the License at
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 923
924 CERTCertificate * clientCertificate; /* used by client */ 924 CERTCertificate * clientCertificate; /* used by client */
925 SECKEYPrivateKey * clientPrivateKey; /* used by client */ 925 SECKEYPrivateKey * clientPrivateKey; /* used by client */
926 /* platformClientKey is present even when NSS_PLATFORM_CLIENT_AUTH is not 926 /* platformClientKey is present even when NSS_PLATFORM_CLIENT_AUTH is not
927 * defined in order to allow cleaner conditional code. 927 * defined in order to allow cleaner conditional code.
928 * At most one of clientPrivateKey and platformClientKey may be set. */ 928 * At most one of clientPrivateKey and platformClientKey may be set. */
929 PlatformKey platformClientKey; /* used by client */ 929 PlatformKey platformClientKey; /* used by client */
930 CERTCertificateList *clientCertChain; /* used by client */ 930 CERTCertificateList *clientCertChain; /* used by client */
931 PRBool sendEmptyCert; /* used by client */ 931 PRBool sendEmptyCert; /* used by client */
932 932
933 SECKEYPrivateKey *channelID; /* used by client */
934 SECKEYPublicKey *channelIDPub; /* used by client */
935
933 int policy; 936 int policy;
934 /* This says what cipher suites we can do, and should 937 /* This says what cipher suites we can do, and should
935 * be either SSL_ALLOWED or SSL_RESTRICTED 938 * be either SSL_ALLOWED or SSL_RESTRICTED
936 */ 939 */
937 PRArenaPool * peerCertArena; 940 PRArenaPool * peerCertArena;
938 /* These are used to keep track of the peer CA */ 941 /* These are used to keep track of the peer CA */
939 void * peerCertChain; 942 void * peerCertChain;
940 /* chain while we are trying to validate it. */ 943 /* chain while we are trying to validate it. */
941 CERTDistNames * ca_list; 944 CERTDistNames * ca_list;
942 /* used by server. trusted CAs for this socket. */ 945 /* used by server. trusted CAs for this socket. */
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after
1898 #elif defined(_WIN32_WCE) 1901 #elif defined(_WIN32_WCE)
1899 #define SSL_GETPID GetCurrentProcessId 1902 #define SSL_GETPID GetCurrentProcessId
1900 #elif defined(WIN32) 1903 #elif defined(WIN32)
1901 extern int __cdecl _getpid(void); 1904 extern int __cdecl _getpid(void);
1902 #define SSL_GETPID _getpid 1905 #define SSL_GETPID _getpid
1903 #else 1906 #else
1904 #define SSL_GETPID() 0 1907 #define SSL_GETPID() 0
1905 #endif 1908 #endif
1906 1909
1907 #endif /* __sslimpl_h_ */ 1910 #endif /* __sslimpl_h_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698