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

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

Issue 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 5 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
« no previous file with comments | « net/third_party/nss/ssl/sslsock.c ('k') | net/third_party/nss/ssl/sslver.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 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 7
8 #ifndef __sslt_h_ 8 #ifndef __sslt_h_
9 #define __sslt_h_ 9 #define __sslt_h_
10 10
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 typedef enum { 188 typedef enum {
189 SSL_sni_host_name = 0, 189 SSL_sni_host_name = 0,
190 SSL_sni_type_total 190 SSL_sni_type_total
191 } SSLSniNameType; 191 } SSLSniNameType;
192 192
193 /* Supported extensions. */ 193 /* Supported extensions. */
194 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */ 194 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */
195 typedef enum { 195 typedef enum {
196 ssl_server_name_xtn = 0, 196 ssl_server_name_xtn = 0,
197 ssl_cert_status_xtn = 5, 197 ssl_cert_status_xtn = 5,
198 #ifdef NSS_ENABLE_ECC 198 #ifndef NSS_DISABLE_ECC
199 ssl_elliptic_curves_xtn = 10, 199 ssl_elliptic_curves_xtn = 10,
200 ssl_ec_point_formats_xtn = 11, 200 ssl_ec_point_formats_xtn = 11,
201 #endif 201 #endif
202 ssl_signature_algorithms_xtn = 13, 202 ssl_signature_algorithms_xtn = 13,
203 ssl_use_srtp_xtn = 14, 203 ssl_use_srtp_xtn = 14,
204 ssl_app_layer_protocol_xtn = 16, 204 ssl_app_layer_protocol_xtn = 16,
205 ssl_signed_certificate_timestamp_xtn = 18, /* RFC 6962 */ 205 ssl_signed_certificate_timestamp_xtn = 18, /* RFC 6962 */
206 ssl_padding_xtn = 21, 206 ssl_padding_xtn = 21,
207 ssl_session_ticket_xtn = 35, 207 ssl_session_ticket_xtn = 35,
208 ssl_next_proto_nego_xtn = 13172, 208 ssl_next_proto_nego_xtn = 13172,
209 ssl_channel_id_xtn = 30032, 209 ssl_channel_id_xtn = 30032,
210 ssl_renegotiation_info_xtn = 0xff01» /* experimental number */ 210 ssl_renegotiation_info_xtn = 0xff01,
211 ssl_tls13_draft_version_xtn = 0xff02 /* experimental number */
211 } SSLExtensionType; 212 } SSLExtensionType;
212 213
213 #define SSL_MAX_EXTENSIONS 12 /* doesn't include ssl_padding_xtn. */ 214 #define SSL_MAX_EXTENSIONS 13 /* doesn't include ssl_padding_xtn. */
214 215
215 #endif /* __sslt_h_ */ 216 #endif /* __sslt_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslsock.c ('k') | net/third_party/nss/ssl/sslver.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698