diff options
| author | haavardm@opera.com <haavardm@opera.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-08 15:48:32 +0000 |
|---|---|---|
| committer | haavardm@opera.com <haavardm@opera.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-08 15:48:32 +0000 |
| commit | 7f0be5dc6cd354f962618d88faa1b1d2b8e32238 (patch) | |
| tree | 2c5b2792249737c292d9d605bf00299be688b123 /openssl/include | |
| parent | 6dd990467cde73b946a0a27bb9360fd2a6a266b3 (diff) | |
| download | openssl-7f0be5dc6cd354f962618d88faa1b1d2b8e32238.tar.gz | |
New tls channel id version for OpenSSL
New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961.
BUG=366961
Review URL: https://codereview.chromium.org/259963009
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@269063 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/include')
| -rw-r--r-- | openssl/include/openssl/ssl.h | 7 | ||||
| -rw-r--r-- | openssl/include/openssl/tls1.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/openssl/include/openssl/ssl.h b/openssl/include/openssl/ssl.h index a3944f1..fe92ccf 100644 --- a/openssl/include/openssl/ssl.h +++ b/openssl/include/openssl/ssl.h @@ -547,6 +547,13 @@ struct ssl_session_st #ifndef OPENSSL_NO_SRP char *srp_username; #endif + + /* original_handshake_hash contains the handshake hash (either + * SHA-1+MD5 or SHA-2, depending on TLS version) for the original, full + * handshake that created a session. This is used by Channel IDs during + * resumption. */ + unsigned char original_handshake_hash[EVP_MAX_MD_SIZE]; + unsigned int original_handshake_hash_len; }; #endif diff --git a/openssl/include/openssl/tls1.h b/openssl/include/openssl/tls1.h index c4f69aa..5559486 100644 --- a/openssl/include/openssl/tls1.h +++ b/openssl/include/openssl/tls1.h @@ -255,7 +255,7 @@ extern "C" { #endif /* This is not an IANA defined extension number */ -#define TLSEXT_TYPE_channel_id 30031 +#define TLSEXT_TYPE_channel_id 30032 /* NameType value from RFC 3546 */ #define TLSEXT_NAMETYPE_host_name 0 |