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

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

Issue 270103002: Revert of New tls channel id version for OpenSSL (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl
Patch Set: 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
« no previous file with comments | « openssl/ssl/s3_clnt.c ('k') | openssl/ssl/ssl_locl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ssl/ssl.h */ 1 /* ssl/ssl.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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 unsigned char *tlsext_ellipticcurvelist; /* peer's list */ 540 unsigned char *tlsext_ellipticcurvelist; /* peer's list */
541 #endif /* OPENSSL_NO_EC */ 541 #endif /* OPENSSL_NO_EC */
542 /* RFC4507 info */ 542 /* RFC4507 info */
543 unsigned char *tlsext_tick; /* Session ticket */ 543 unsigned char *tlsext_tick; /* Session ticket */
544 size_t tlsext_ticklen; /* Session ticket length */ 544 size_t tlsext_ticklen; /* Session ticket length */
545 long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */ 545 long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
546 #endif 546 #endif
547 #ifndef OPENSSL_NO_SRP 547 #ifndef OPENSSL_NO_SRP
548 char *srp_username; 548 char *srp_username;
549 #endif 549 #endif
550
551 /* original_handshake_hash contains the handshake hash (either
552 * SHA-1+MD5 or SHA-2, depending on TLS version) for the original, full
553 * handshake that created a session. This is used by Channel IDs during
554 * resumption. */
555 unsigned char original_handshake_hash[EVP_MAX_MD_SIZE];
556 unsigned int original_handshake_hash_len;
557 }; 550 };
558 551
559 #endif 552 #endif
560 553
561 #define SSL_OP_MICROSOFT_SESS_ID_BUG 0x00000001L 554 #define SSL_OP_MICROSOFT_SESS_ID_BUG 0x00000001L
562 #define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x00000002L 555 #define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x00000002L
563 /* Allow initial connection to servers that don't support RI */ 556 /* Allow initial connection to servers that don't support RI */
564 #define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L 557 #define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L
565 #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L 558 #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
566 #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L 559 #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
(...skipping 2102 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 #define SSL_R_WRONG_SIGNATURE_TYPE 370 2662 #define SSL_R_WRONG_SIGNATURE_TYPE 370
2670 #define SSL_R_WRONG_SSL_VERSION 266 2663 #define SSL_R_WRONG_SSL_VERSION 266
2671 #define SSL_R_WRONG_VERSION_NUMBER 267 2664 #define SSL_R_WRONG_VERSION_NUMBER 267
2672 #define SSL_R_X509_LIB 268 2665 #define SSL_R_X509_LIB 268
2673 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269 2666 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269
2674 2667
2675 #ifdef __cplusplus 2668 #ifdef __cplusplus
2676 } 2669 }
2677 #endif 2670 #endif
2678 #endif 2671 #endif
OLDNEW
« no previous file with comments | « openssl/ssl/s3_clnt.c ('k') | openssl/ssl/ssl_locl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698