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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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: sslt.h,v 1.23 2012/06/07 02:06:19 wtc%google.com Exp $ */ 7 /* $Id$ */
8 8
9 #ifndef __sslt_h_ 9 #ifndef __sslt_h_
10 #define __sslt_h_ 10 #define __sslt_h_
11 11
12 #include "prtypes.h" 12 #include "prtypes.h"
13 13
14 /* SECItemArray is added in NSS 3.15. Define the type if compiling
15 ** against an older version of NSS.
16 */
17 #include "nssutil.h"
18 #if NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15
19 typedef struct SECItemArrayStr SECItemArray;
20
21 struct SECItemArrayStr {
22 SECItem *items;
23 unsigned int len;
24 };
25 #endif /* NSSUTIL_VMAJOR == 3 && NSSUTIL_VMINOR < 15 */
26
14 typedef struct SSL3StatisticsStr { 27 typedef struct SSL3StatisticsStr {
15 /* statistics from ssl3_SendClientHello (sch) */ 28 /* statistics from ssl3_SendClientHello (sch) */
16 long sch_sid_cache_hits; 29 long sch_sid_cache_hits;
17 long sch_sid_cache_misses; 30 long sch_sid_cache_misses;
18 long sch_sid_cache_not_ok; 31 long sch_sid_cache_not_ok;
19 32
20 /* statistics from ssl3_HandleServerHello (hsh) */ 33 /* statistics from ssl3_HandleServerHello (hsh) */
21 long hsh_sid_cache_hits; 34 long hsh_sid_cache_hits;
22 long hsh_sid_cache_misses; 35 long hsh_sid_cache_misses;
23 long hsh_sid_cache_not_ok; 36 long hsh_sid_cache_not_ok;
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ssl_use_srtp_xtn = 14, 196 ssl_use_srtp_xtn = 14,
184 ssl_session_ticket_xtn = 35, 197 ssl_session_ticket_xtn = 35,
185 ssl_next_proto_nego_xtn = 13172, 198 ssl_next_proto_nego_xtn = 13172,
186 ssl_channel_id_xtn = 30031, 199 ssl_channel_id_xtn = 30031,
187 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ 200 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
188 } SSLExtensionType; 201 } SSLExtensionType;
189 202
190 #define SSL_MAX_EXTENSIONS 9 203 #define SSL_MAX_EXTENSIONS 9
191 204
192 #endif /* __sslt_h_ */ 205 #endif /* __sslt_h_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698