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

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

Issue 16394004: Support the new TLS 1.2 HMAC-SHA256 cipher suites specified in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add a patch Created 7 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
« no previous file with comments | « net/third_party/nss/ssl/sslenum.c ('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 * This Source Code Form is subject to the terms of the Mozilla Public 5 * This Source Code Form is subject to the terms of the Mozilla Public
6 * License, v. 2.0. If a copy of the MPL was not distributed with this 6 * License, v. 2.0. If a copy of the MPL was not distributed with this
7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
8 /* $Id$ */ 8 /* $Id$ */
9 9
10 #ifndef __sslimpl_h_ 10 #ifndef __sslimpl_h_
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #define calg_fortezza ssl_calg_fortezza /* deprecated, must preserve */ 64 #define calg_fortezza ssl_calg_fortezza /* deprecated, must preserve */
65 #define calg_aes ssl_calg_aes 65 #define calg_aes ssl_calg_aes
66 #define calg_camellia ssl_calg_camellia 66 #define calg_camellia ssl_calg_camellia
67 #define calg_seed ssl_calg_seed 67 #define calg_seed ssl_calg_seed
68 68
69 #define mac_null ssl_mac_null 69 #define mac_null ssl_mac_null
70 #define mac_md5 ssl_mac_md5 70 #define mac_md5 ssl_mac_md5
71 #define mac_sha ssl_mac_sha 71 #define mac_sha ssl_mac_sha
72 #define hmac_md5 ssl_hmac_md5 72 #define hmac_md5 ssl_hmac_md5
73 #define hmac_sha ssl_hmac_sha 73 #define hmac_sha ssl_hmac_sha
74 #define hmac_sha256 ssl_hmac_sha256
74 75
75 #define SET_ERROR_CODE /* reminder */ 76 #define SET_ERROR_CODE /* reminder */
76 #define SEND_ALERT /* reminder */ 77 #define SEND_ALERT /* reminder */
77 #define TEST_FOR_FAILURE /* reminder */ 78 #define TEST_FOR_FAILURE /* reminder */
78 #define DEAL_WITH_FAILURE /* reminder */ 79 #define DEAL_WITH_FAILURE /* reminder */
79 80
80 #if defined(DEBUG) || defined(TRACE) 81 #if defined(DEBUG) || defined(TRACE)
81 #ifdef __cplusplus 82 #ifdef __cplusplus
82 #define Debug 1 83 #define Debug 1
83 #else 84 #else
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 unsigned int isPresent : 1; 284 unsigned int isPresent : 1;
284 #else 285 #else
285 ssl3CipherSuite cipher_suite; 286 ssl3CipherSuite cipher_suite;
286 PRUint8 policy; 287 PRUint8 policy;
287 unsigned char enabled : 1; 288 unsigned char enabled : 1;
288 unsigned char isPresent : 1; 289 unsigned char isPresent : 1;
289 #endif 290 #endif
290 } ssl3CipherSuiteCfg; 291 } ssl3CipherSuiteCfg;
291 292
292 #ifdef NSS_ENABLE_ECC 293 #ifdef NSS_ENABLE_ECC
293 #define ssl_V3_SUITES_IMPLEMENTED 50 294 #define ssl_V3_SUITES_IMPLEMENTED 57
294 #else 295 #else
295 #define ssl_V3_SUITES_IMPLEMENTED 30 296 #define ssl_V3_SUITES_IMPLEMENTED 35
296 #endif /* NSS_ENABLE_ECC */ 297 #endif /* NSS_ENABLE_ECC */
297 298
298 #define MAX_DTLS_SRTP_CIPHER_SUITES 4 299 #define MAX_DTLS_SRTP_CIPHER_SUITES 4
299 300
300 typedef struct sslOptionsStr { 301 typedef struct sslOptionsStr {
301 /* If SSL_SetNextProtoNego has been called, then this contains the 302 /* If SSL_SetNextProtoNego has been called, then this contains the
302 * list of supported protocols. */ 303 * list of supported protocols. */
303 SECItem nextProtoNego; 304 SECItem nextProtoNego;
304 305
305 unsigned int useSecurity : 1; /* 1 */ 306 unsigned int useSecurity : 1; /* 1 */
(...skipping 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) 1894 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
1894 #define SSL_GETPID getpid 1895 #define SSL_GETPID getpid
1895 #elif defined(WIN32) 1896 #elif defined(WIN32)
1896 extern int __cdecl _getpid(void); 1897 extern int __cdecl _getpid(void);
1897 #define SSL_GETPID _getpid 1898 #define SSL_GETPID _getpid
1898 #else 1899 #else
1899 #define SSL_GETPID() 0 1900 #define SSL_GETPID() 0
1900 #endif 1901 #endif
1901 1902
1902 #endif /* __sslimpl_h_ */ 1903 #endif /* __sslimpl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslenum.c ('k') | net/third_party/nss/ssl/sslinfo.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698