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

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

Issue 18346010: net: support ALPN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove the new error. Created 7 years, 5 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */ 189 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */
190 typedef enum { 190 typedef enum {
191 ssl_server_name_xtn = 0, 191 ssl_server_name_xtn = 0,
192 ssl_cert_status_xtn = 5, 192 ssl_cert_status_xtn = 5,
193 #ifdef NSS_ENABLE_ECC 193 #ifdef NSS_ENABLE_ECC
194 ssl_elliptic_curves_xtn = 10, 194 ssl_elliptic_curves_xtn = 10,
195 ssl_ec_point_formats_xtn = 11, 195 ssl_ec_point_formats_xtn = 11,
196 #endif 196 #endif
197 ssl_signature_algorithms_xtn = 13, 197 ssl_signature_algorithms_xtn = 13,
198 ssl_use_srtp_xtn = 14, 198 ssl_use_srtp_xtn = 14,
199 ssl_application_layer_protocol = 16,
wtc 2013/08/01 19:35:24 The enum for ALPN should also end in _xtn like the
199 ssl_session_ticket_xtn = 35, 200 ssl_session_ticket_xtn = 35,
200 ssl_next_proto_nego_xtn = 13172, 201 ssl_next_proto_nego_xtn = 13172,
201 ssl_channel_id_xtn = 30031, 202 ssl_channel_id_xtn = 30031,
202 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ 203 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
203 } SSLExtensionType; 204 } SSLExtensionType;
204 205
205 #define SSL_MAX_EXTENSIONS 10 206 #define SSL_MAX_EXTENSIONS 11
206 207
207 #endif /* __sslt_h_ */ 208 #endif /* __sslt_h_ */
OLDNEW
« net/socket/ssl_client_socket_nss.cc ('K') | « net/third_party/nss/ssl/ssl3ext.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698