commit | 69939df2891f62f7f00ff2ac275f1cd81a67454c | [log] [tgz] |
---|---|---|
author | Robert Sloan <varomodt@google.com> | Mon Jan 09 10:53:07 2017 -0800 |
committer | Robert Sloan <varomodt@google.com> | Mon Jan 09 15:18:23 2017 -0800 |
tree | 467d0f510b31deef87dc70b119ea143090cc67a6 | |
parent | e7531f038363d24a103c820cff38898455ff66fe [diff] [blame] |
external/boringssl: Sync to 9c33ae85621ef8e00a42309b5101e0bedd02b816. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/629db8cd0c84628e37aa81242b5b07fec7602f55..9c33ae85621ef8e00a42309b5101e0bedd02b816 Bug: 33622440 Test: BoringSSL tests Change-Id: I20da15ad995a620b6b2f08db20c77ebd0f05ca10
diff --git a/src/include/openssl/tls1.h b/src/include/openssl/tls1.h index 54c2800..7d9f2ac 100644 --- a/src/include/openssl/tls1.h +++ b/src/include/openssl/tls1.h
@@ -213,6 +213,7 @@ #define TLSEXT_TYPE_supported_versions 43 #define TLSEXT_TYPE_cookie 44 #define TLSEXT_TYPE_psk_key_exchange_modes 45 +#define TLSEXT_TYPE_ticket_early_data_info 46 /* ExtensionType value from RFC5746 */ #define TLSEXT_TYPE_renegotiate 0xff01 @@ -226,6 +227,9 @@ /* This is not an IANA defined extension number */ #define TLSEXT_TYPE_channel_id 30032 +/* This is not an IANA defined extension number */ +#define TLSEXT_TYPE_short_header 27463 + /* status request value from RFC 3546 */ #define TLSEXT_STATUSTYPE_ocsp 1