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

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

Issue 6804032: Add TLS-SRP (RFC 5054) support Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: remove "httpsv" scheme, minor NSS/OpenSSL changes Created 9 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 | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/ssl/sslsock.c ('k') | net/tools/testserver/testserver.py » ('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 * ***** 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 long hch_sid_ticket_parse_failures; 67 long hch_sid_ticket_parse_failures;
68 } SSL3Statistics; 68 } SSL3Statistics;
69 69
70 /* Key Exchange algorithm values */ 70 /* Key Exchange algorithm values */
71 typedef enum { 71 typedef enum {
72 ssl_kea_null = 0, 72 ssl_kea_null = 0,
73 ssl_kea_rsa = 1, 73 ssl_kea_rsa = 1,
74 ssl_kea_dh = 2, 74 ssl_kea_dh = 2,
75 ssl_kea_fortezza = 3, /* deprecated, now unused */ 75 ssl_kea_fortezza = 3, /* deprecated, now unused */
76 ssl_kea_ecdh = 4, 76 ssl_kea_ecdh = 4,
77 ssl_kea_srp = 5,
78 ssl_kea_srp_rsa = 6,
79 ssl_kea_srp_dss = 7,
77 ssl_kea_size /* number of ssl_kea_ algorithms */ 80 ssl_kea_size /* number of ssl_kea_ algorithms */
78 } SSLKEAType; 81 } SSLKEAType;
79 82
80 /* The following defines are for backwards compatibility. 83 /* The following defines are for backwards compatibility.
81 ** They will be removed in a forthcoming release to reduce namespace pollution. 84 ** They will be removed in a forthcoming release to reduce namespace pollution.
82 ** programs that use the kt_ symbols should convert to the ssl_kt_ symbols 85 ** programs that use the kt_ symbols should convert to the ssl_kt_ symbols
83 ** soon. 86 ** soon.
84 */ 87 */
85 #define kt_null ssl_kea_null 88 #define kt_null ssl_kea_null
86 #define kt_rsa ssl_kea_rsa 89 #define kt_rsa ssl_kea_rsa
87 #define kt_dh ssl_kea_dh 90 #define kt_dh ssl_kea_dh
88 #define kt_fortezza ssl_kea_fortezza /* deprecated, now unused */ 91 #define kt_fortezza ssl_kea_fortezza /* deprecated, now unused */
89 #define kt_ecdh ssl_kea_ecdh 92 #define kt_ecdh ssl_kea_ecdh
90 #define kt_kea_size ssl_kea_size 93 #define kt_kea_size ssl_kea_size
94 #define kt_srp ssl_kea_srp
91 95
92 typedef enum { 96 typedef enum {
93 ssl_sign_null = 0, 97 ssl_sign_null = 0,
94 ssl_sign_rsa = 1, 98 ssl_sign_rsa = 1,
95 ssl_sign_dsa = 2, 99 ssl_sign_dsa = 2,
96 ssl_sign_ecdsa = 3 100 ssl_sign_ecdsa = 3
97 } SSLSignType; 101 } SSLSignType;
98 102
99 typedef enum { 103 typedef enum {
100 ssl_auth_null = 0, 104 ssl_auth_null = 0,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 200
197 /* Supported extensions. */ 201 /* Supported extensions. */
198 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */ 202 /* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */
199 typedef enum { 203 typedef enum {
200 ssl_server_name_xtn = 0, 204 ssl_server_name_xtn = 0,
201 ssl_cert_status_xtn = 5, 205 ssl_cert_status_xtn = 5,
202 #ifdef NSS_ENABLE_ECC 206 #ifdef NSS_ENABLE_ECC
203 ssl_elliptic_curves_xtn = 10, 207 ssl_elliptic_curves_xtn = 10,
204 ssl_ec_point_formats_xtn = 11, 208 ssl_ec_point_formats_xtn = 11,
205 #endif 209 #endif
210 ssl_srp_hello_xtn = 12,
206 ssl_session_ticket_xtn = 35, 211 ssl_session_ticket_xtn = 35,
207 ssl_next_proto_neg_xtn = 13172, 212 ssl_next_proto_neg_xtn = 13172,
208 ssl_snap_start_xtn = 13174, 213 ssl_snap_start_xtn = 13174,
209 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ 214 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
210 } SSLExtensionType; 215 } SSLExtensionType;
211 216
212 #define SSL_MAX_EXTENSIONS 8 217 #define SSL_MAX_EXTENSIONS 9
213 218
214 typedef enum { 219 typedef enum {
215 /* No Snap Start handshake was attempted. */ 220 /* No Snap Start handshake was attempted. */
216 SSL_SNAP_START_NONE = 0, 221 SSL_SNAP_START_NONE = 0,
217 /* A Snap Start full handshake was completed. */ 222 /* A Snap Start full handshake was completed. */
218 SSL_SNAP_START_FULL = 1, 223 SSL_SNAP_START_FULL = 1,
219 /* A Snap Start full handshake was attempted, but failed. */ 224 /* A Snap Start full handshake was attempted, but failed. */
220 SSL_SNAP_START_RECOVERY = 2, 225 SSL_SNAP_START_RECOVERY = 2,
221 /* A Snap Start resume handshake was completed. */ 226 /* A Snap Start resume handshake was completed. */
222 SSL_SNAP_START_RESUME = 3, 227 SSL_SNAP_START_RESUME = 3,
223 /* A Snap Start resume handshake was attempted, but failed. */ 228 /* A Snap Start resume handshake was attempted, but failed. */
224 SSL_SNAP_START_RESUME_RECOVERY = 4 229 SSL_SNAP_START_RESUME_RECOVERY = 4
225 } SSLSnapStartResult; 230 } SSLSnapStartResult;
226 231
227 #endif /* __sslt_h_ */ 232 #endif /* __sslt_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslsock.c ('k') | net/tools/testserver/testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698