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

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

Issue 6804032: Add TLS-SRP (RFC 5054) support Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: remove "httpsv" scheme, minor NSS/OpenSSL changes Created 9 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 | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/ssl/sslerr.h ('k') | net/third_party/nss/ssl/sslinfo.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 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 unsigned int isPresent : 1; 310 unsigned int isPresent : 1;
311 #else 311 #else
312 ssl3CipherSuite cipher_suite; 312 ssl3CipherSuite cipher_suite;
313 PRUint8 policy; 313 PRUint8 policy;
314 unsigned char enabled : 1; 314 unsigned char enabled : 1;
315 unsigned char isPresent : 1; 315 unsigned char isPresent : 1;
316 #endif 316 #endif
317 } ssl3CipherSuiteCfg; 317 } ssl3CipherSuiteCfg;
318 318
319 #ifdef NSS_ENABLE_ECC 319 #ifdef NSS_ENABLE_ECC
320 #define ssl_V3_SUITES_IMPLEMENTED 50 320 #define ssl_V3_SUITES_IMPLEMENTED 59
321 #else 321 #else
322 #define ssl_V3_SUITES_IMPLEMENTED 30 322 #define ssl_V3_SUITES_IMPLEMENTED 39
323 #endif /* NSS_ENABLE_ECC */ 323 #endif /* NSS_ENABLE_ECC */
324 324
325 typedef struct sslOptionsStr { 325 typedef struct sslOptionsStr {
326 /* For clients, this is a validated list of protocols in preference order 326 /* For clients, this is a validated list of protocols in preference order
327 * and wire format. For servers, this is the list of support protocols, 327 * and wire format. For servers, this is the list of support protocols,
328 * also in wire format. */ 328 * also in wire format. */
329 SECItem nextProtoNego; 329 SECItem nextProtoNego;
330 330
331 unsigned int useSecurity : 1; /* 1 */ 331 unsigned int useSecurity : 1; /* 1 */
332 unsigned int useSocks : 1; /* 2 */ 332 unsigned int useSocks : 1; /* 2 */
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 sslSendFunc send; /*xmitBufLock*/ /* ssl 2 & 3 */ 1043 sslSendFunc send; /*xmitBufLock*/ /* ssl 2 & 3 */
1044 int isServer; /* Spec Lock?*/ /* ssl 2 & 3 */ 1044 int isServer; /* Spec Lock?*/ /* ssl 2 & 3 */
1045 sslBuffer writeBuf; /*xmitBufLock*/ /* ssl 2 & 3 */ 1045 sslBuffer writeBuf; /*xmitBufLock*/ /* ssl 2 & 3 */
1046 1046
1047 int cipherType; /* ssl 2 & 3 */ 1047 int cipherType; /* ssl 2 & 3 */
1048 int keyBits; /* ssl 2 & 3 */ 1048 int keyBits; /* ssl 2 & 3 */
1049 int secretKeyBits; /* ssl 2 & 3 */ 1049 int secretKeyBits; /* ssl 2 & 3 */
1050 CERTCertificate *localCert; /* ssl 2 & 3 */ 1050 CERTCertificate *localCert; /* ssl 2 & 3 */
1051 CERTCertificate *peerCert; /* ssl 2 & 3 */ 1051 CERTCertificate *peerCert; /* ssl 2 & 3 */
1052 SECKEYPublicKey *peerKey; /* ssl3 only */ 1052 SECKEYPublicKey *peerKey; /* ssl3 only */
1053 SECItem *userName; /* SSL username credential */
1054 SECItem *userPasswd; /* SSL userpasswd credential */
1053 1055
1054 SSLSignType authAlgorithm; 1056 SSLSignType authAlgorithm;
1055 PRUint32 authKeyBits; 1057 PRUint32 authKeyBits;
1056 SSLKEAType keaType; 1058 SSLKEAType keaType;
1057 PRUint32 keaKeyBits; 1059 PRUint32 keaKeyBits;
1058 1060
1059 /* 1061 /*
1060 ** Procs used for SID cache (nonce) management. 1062 ** Procs used for SID cache (nonce) management.
1061 ** Different implementations exist for clients/servers 1063 ** Different implementations exist for clients/servers
1062 ** The lookup proc is only used for servers. Baloney! 1064 ** The lookup proc is only used for servers. Baloney!
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 SSLGetPlatformClientAuthData getPlatformClientAuthData; 1154 SSLGetPlatformClientAuthData getPlatformClientAuthData;
1153 void *getPlatformClientAuthDataArg; 1155 void *getPlatformClientAuthDataArg;
1154 #endif /* NSS_PLATFORM_CLIENT_AUTH */ 1156 #endif /* NSS_PLATFORM_CLIENT_AUTH */
1155 SSLSNISocketConfig sniSocketConfig; 1157 SSLSNISocketConfig sniSocketConfig;
1156 void *sniSocketConfigArg; 1158 void *sniSocketConfigArg;
1157 SSLBadCertHandler handleBadCert; 1159 SSLBadCertHandler handleBadCert;
1158 void *badCertArg; 1160 void *badCertArg;
1159 SSLHandshakeCallback handshakeCallback; 1161 SSLHandshakeCallback handshakeCallback;
1160 void *handshakeCallbackData; 1162 void *handshakeCallbackData;
1161 void *pkcs11PinArg; 1163 void *pkcs11PinArg;
1164 SSLUserPasswdCB getUserPasswd;
1165 void *getUserPasswdArg;
1166 SSLGetSRPParamsCB getSRPParams;
1167 void *getSRPParamsArg;
1162 1168
1163 PRIntervalTime rTimeout; /* timeout for NSPR I/O */ 1169 PRIntervalTime rTimeout; /* timeout for NSPR I/O */
1164 PRIntervalTime wTimeout; /* timeout for NSPR I/O */ 1170 PRIntervalTime wTimeout; /* timeout for NSPR I/O */
1165 PRIntervalTime cTimeout; /* timeout for NSPR I/O */ 1171 PRIntervalTime cTimeout; /* timeout for NSPR I/O */
1166 1172
1167 PZLock * recvLock; /* lock against multiple reader threads. */ 1173 PZLock * recvLock; /* lock against multiple reader threads. */
1168 PZLock * sendLock; /* lock against multiple sender threads. */ 1174 PZLock * sendLock; /* lock against multiple sender threads. */
1169 1175
1170 PZMonitor * recvBufLock; /* locks low level recv buffers. */ 1176 PZMonitor * recvBufLock; /* locks low level recv buffers. */
1171 PZMonitor * xmitBufLock; /* locks low level xmit buffers. */ 1177 PZMonitor * xmitBufLock; /* locks low level xmit buffers. */
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 #elif defined(_WIN32_WCE) 1825 #elif defined(_WIN32_WCE)
1820 #define SSL_GETPID GetCurrentProcessId 1826 #define SSL_GETPID GetCurrentProcessId
1821 #elif defined(WIN32) 1827 #elif defined(WIN32)
1822 extern int __cdecl _getpid(void); 1828 extern int __cdecl _getpid(void);
1823 #define SSL_GETPID _getpid 1829 #define SSL_GETPID _getpid
1824 #else 1830 #else
1825 #define SSL_GETPID() 0 1831 #define SSL_GETPID() 0
1826 #endif 1832 #endif
1827 1833
1828 #endif /* __sslimpl_h_ */ 1834 #endif /* __sslimpl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslerr.h ('k') | net/third_party/nss/ssl/sslinfo.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698