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

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

Issue 9558017: Update net/third_party/nss to NSS 3.13.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before checkin Created 8 years, 9 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/sslsock.c ('k') | no next file » | 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 * ***** BEGIN LICENSE BLOCK ***** 4 * ***** BEGIN LICENSE BLOCK *****
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
6 * 6 *
7 * The contents of this file are subject to the Mozilla Public License Version 7 * The contents of this file are subject to the Mozilla Public License Version
8 * 1.1 (the "License"); you may not use this file except in compliance with 8 * 1.1 (the "License"); you may not use this file except in compliance with
9 * the License. You may obtain a copy of the License at 9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/ 10 * http://www.mozilla.org/MPL/
(...skipping 19 matching lines...) Expand all
30 * in which case the provisions of the GPL or the LGPL are applicable instead 30 * in which case the provisions of the GPL or the LGPL are applicable instead
31 * of those above. If you wish to allow use of your version of this file only 31 * of those above. If you wish to allow use of your version of this file only
32 * under the terms of either the GPL or the LGPL, and not to allow others to 32 * under the terms of either the GPL or the LGPL, and not to allow others to
33 * use your version of this file under the terms of the MPL, indicate your 33 * use your version of this file under the terms of the MPL, indicate your
34 * decision by deleting the provisions above and replace them with the notice 34 * decision by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL or the LGPL. If you do not delete 35 * and other provisions required by the GPL or the LGPL. If you do not delete
36 * the provisions above, a recipient may use your version of this file under 36 * the provisions above, a recipient may use your version of this file under
37 * the terms of any one of the MPL, the GPL or the LGPL. 37 * the terms of any one of the MPL, the GPL or the LGPL.
38 * 38 *
39 * ***** END LICENSE BLOCK ***** */ 39 * ***** END LICENSE BLOCK ***** */
40 /* $Id: sslt.h,v 1.16 2010/02/04 03:21:11 wtc%google.com Exp $ */ 40 /* $Id: sslt.h,v 1.18 2012/02/15 21:52:08 kaie%kuix.de Exp $ */
41 41
42 #ifndef __sslt_h_ 42 #ifndef __sslt_h_
43 #define __sslt_h_ 43 #define __sslt_h_
44 44
45 #include "prtypes.h" 45 #include "prtypes.h"
46 46
47 typedef struct SSL3StatisticsStr { 47 typedef struct SSL3StatisticsStr {
48 /* statistics from ssl3_SendClientHello (sch) */ 48 /* statistics from ssl3_SendClientHello (sch) */
49 long sch_sid_cache_hits; 49 long sch_sid_cache_hits;
50 long sch_sid_cache_misses; 50 long sch_sid_cache_misses;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 /* Supported extensions. */ 197 /* Supported extensions. */
198 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */ 198 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */
199 typedef enum { 199 typedef enum {
200 ssl_server_name_xtn = 0, 200 ssl_server_name_xtn = 0,
201 ssl_cert_status_xtn = 5, 201 ssl_cert_status_xtn = 5,
202 #ifdef NSS_ENABLE_ECC 202 #ifdef NSS_ENABLE_ECC
203 ssl_elliptic_curves_xtn = 10, 203 ssl_elliptic_curves_xtn = 10,
204 ssl_ec_point_formats_xtn = 11, 204 ssl_ec_point_formats_xtn = 11,
205 #endif 205 #endif
206 ssl_session_ticket_xtn = 35, 206 ssl_session_ticket_xtn = 35,
207 ssl_next_proto_neg_xtn = 13172, 207 ssl_next_proto_nego_xtn = 13172,
208 ssl_cached_info_xtn = 13173,
209 ssl_encrypted_client_certs = 13180, /* not IANA assigned. */ 208 ssl_encrypted_client_certs = 13180, /* not IANA assigned. */
210 ssl_renegotiation_info_xtn = 0xff01, /* experimental number */ 209 ssl_renegotiation_info_xtn = 0xff01, /* experimental number */
211 ssl_ob_cert_xtn = 13175 /* experimental number */ 210 ssl_ob_cert_xtn = 13175 /* experimental number */
212 } SSLExtensionType; 211 } SSLExtensionType;
213 212
214 #define SSL_MAX_EXTENSIONS 10 213 #define SSL_MAX_EXTENSIONS 9
215 214
216 #endif /* __sslt_h_ */ 215 #endif /* __sslt_h_ */
OLDNEW
« no previous file with comments | « 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