| commit | a833c357edae4eb7f47b9808bf744bd9bb0df18d | [log] [tgz] |
|---|---|---|
| author | Steven Valdez <svaldez@google.com> | Tue Nov 01 13:39:36 2016 -0400 |
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | Tue Nov 15 06:57:21 2016 +0000 |
| tree | fffcf467ffad7654e1426a192cb3ced469d78aa0 | |
| parent | ced9479fd1669cc8ca0762e612316d1f18098361 [diff] [blame] |
Update to TLS 1.3 draft 18. This is the squash of the following CLs: https://boringssl-review.googlesource.com/c/12021/9 https://boringssl-review.googlesource.com/c/12022/9 https://boringssl-review.googlesource.com/c/12107/19 https://boringssl-review.googlesource.com/c/12141/22 https://boringssl-review.googlesource.com/c/12181/33 The Go portions were written by Nick Harper BUG=112 Change-Id: I375a1fcead493ec3e0282e231ccc8d7c4dde5063 Reviewed-on: https://boringssl-review.googlesource.com/12300 CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 35d3145..dfaf78a 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h
@@ -205,13 +205,14 @@ /* ExtensionType value from RFC4507 */ #define TLSEXT_TYPE_session_ticket 35 -/* ExtensionType values from draft-ietf-tls-tls13-16 */ +/* ExtensionType values from draft-ietf-tls-tls13-18 */ #define TLSEXT_TYPE_supported_groups 10 #define TLSEXT_TYPE_key_share 40 #define TLSEXT_TYPE_pre_shared_key 41 #define TLSEXT_TYPE_early_data 42 #define TLSEXT_TYPE_supported_versions 43 #define TLSEXT_TYPE_cookie 44 +#define TLSEXT_TYPE_psk_key_exchange_modes 45 /* ExtensionType value from RFC5746 */ #define TLSEXT_TYPE_renegotiate 0xff01