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

Side by Side Diff: openssl/ssl/tls1.h

Issue 259963009: New tls channel id version for OpenSSL (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl
Patch Set: Added patch files Created 6 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 /* ssl/tls1.h */ 1 /* ssl/tls1.h */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 /* Temporary extension type */ 249 /* Temporary extension type */
250 #define TLSEXT_TYPE_renegotiate 0xff01 250 #define TLSEXT_TYPE_renegotiate 0xff01
251 251
252 #ifndef OPENSSL_NO_NEXTPROTONEG 252 #ifndef OPENSSL_NO_NEXTPROTONEG
253 /* This is not an IANA defined extension number */ 253 /* This is not an IANA defined extension number */
254 #define TLSEXT_TYPE_next_proto_neg 13172 254 #define TLSEXT_TYPE_next_proto_neg 13172
255 #endif 255 #endif
256 256
257 /* This is not an IANA defined extension number */ 257 /* This is not an IANA defined extension number */
258 #define TLSEXT_TYPE_channel_id» » » 30031 258 #define TLSEXT_TYPE_channel_id» » » 30032
259 259
260 /* NameType value from RFC 3546 */ 260 /* NameType value from RFC 3546 */
261 #define TLSEXT_NAMETYPE_host_name 0 261 #define TLSEXT_NAMETYPE_host_name 0
262 /* status request value from RFC 3546 */ 262 /* status request value from RFC 3546 */
263 #define TLSEXT_STATUSTYPE_ocsp 1 263 #define TLSEXT_STATUSTYPE_ocsp 1
264 264
265 /* ECPointFormat values from draft-ietf-tls-ecc-12 */ 265 /* ECPointFormat values from draft-ietf-tls-ecc-12 */
266 #define TLSEXT_ECPOINTFORMAT_first 0 266 #define TLSEXT_ECPOINTFORMAT_first 0
267 #define TLSEXT_ECPOINTFORMAT_uncompressed 0 267 #define TLSEXT_ECPOINTFORMAT_uncompressed 0
268 #define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime 1 268 #define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime 1
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 struct tls_session_ticket_ext_st 743 struct tls_session_ticket_ext_st
744 { 744 {
745 unsigned short length; 745 unsigned short length;
746 void *data; 746 void *data;
747 }; 747 };
748 748
749 #ifdef __cplusplus 749 #ifdef __cplusplus
750 } 750 }
751 #endif 751 #endif
752 #endif 752 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698