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

Side by Side Diff: net/third_party/nss/ssl/sslt.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: Additional changes to pass upstream NSS SSL tests 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
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$ */ 7 /* $Id$ */
8 8
9 #ifndef __sslt_h_ 9 #ifndef __sslt_h_
10 #define __sslt_h_ 10 #define __sslt_h_
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ssl_calg_aes = 7, /* coming soon */ 95 ssl_calg_aes = 7, /* coming soon */
96 ssl_calg_camellia = 8, 96 ssl_calg_camellia = 8,
97 ssl_calg_seed = 9 97 ssl_calg_seed = 9
98 } SSLCipherAlgorithm; 98 } SSLCipherAlgorithm;
99 99
100 typedef enum { 100 typedef enum {
101 ssl_mac_null = 0, 101 ssl_mac_null = 0,
102 ssl_mac_md5 = 1, 102 ssl_mac_md5 = 1,
103 ssl_mac_sha = 2, 103 ssl_mac_sha = 2,
104 ssl_hmac_md5 = 3, /* TLS HMAC version of mac_md5 */ 104 ssl_hmac_md5 = 3, /* TLS HMAC version of mac_md5 */
105 ssl_hmac_sha = 4 » /* TLS HMAC version of mac_sha */ 105 ssl_hmac_sha = 4, » /* TLS HMAC version of mac_sha */
106 ssl_hmac_sha256 = 5
106 } SSLMACAlgorithm; 107 } SSLMACAlgorithm;
107 108
108 typedef enum { 109 typedef enum {
109 ssl_compression_null = 0, 110 ssl_compression_null = 0,
110 ssl_compression_deflate = 1 /* RFC 3749 */ 111 ssl_compression_deflate = 1 /* RFC 3749 */
111 } SSLCompressionMethod; 112 } SSLCompressionMethod;
112 113
113 typedef struct SSLChannelInfoStr { 114 typedef struct SSLChannelInfoStr {
114 PRUint32 length; 115 PRUint32 length;
115 PRUint16 protocolVersion; 116 PRUint16 protocolVersion;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 ssl_use_srtp_xtn = 14, 198 ssl_use_srtp_xtn = 14,
198 ssl_session_ticket_xtn = 35, 199 ssl_session_ticket_xtn = 35,
199 ssl_next_proto_nego_xtn = 13172, 200 ssl_next_proto_nego_xtn = 13172,
200 ssl_channel_id_xtn = 30031, 201 ssl_channel_id_xtn = 30031,
201 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ 202 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
202 } SSLExtensionType; 203 } SSLExtensionType;
203 204
204 #define SSL_MAX_EXTENSIONS 10 205 #define SSL_MAX_EXTENSIONS 10
205 206
206 #endif /* __sslt_h_ */ 207 #endif /* __sslt_h_ */
OLDNEW
« net/third_party/nss/ssl/sslsock.c ('K') | « net/third_party/nss/ssl/sslsock.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698