summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2018-11-06 20:48:08 +0000
committerjsing <>2018-11-06 20:48:08 +0000
commit85ff90e3521b98704f2fee667927fa140f56dd14 (patch)
treedbdfae714afff2f2643b038df079721289f0cb6e
parentfd25347db80b1fd9a198283b5d3e3a953fd2e011 (diff)
downloadopenbsd-85ff90e3521b98704f2fee667927fa140f56dd14.tar.gz
openbsd-85ff90e3521b98704f2fee667927fa140f56dd14.tar.bz2
openbsd-85ff90e3521b98704f2fee667927fa140f56dd14.zip
Add TLS extension type values for TLSv1.3 (under guards).
ok tb@
-rw-r--r--src/lib/libssl/tls1.h18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
index dd8d778ff6..c0b14b2099 100644
--- a/src/lib/libssl/tls1.h
+++ b/src/lib/libssl/tls1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls1.h,v 1.34 2018/11/06 01:37:23 jsing Exp $ */ 1/* $OpenBSD: tls1.h,v 1.35 2018/11/06 20:48:08 jsing Exp $ */
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 *
@@ -248,7 +248,7 @@ extern "C" {
248/* ExtensionType value from RFC 5054. */ 248/* ExtensionType value from RFC 5054. */
249#define TLSEXT_TYPE_srp 12 249#define TLSEXT_TYPE_srp 12
250 250
251/* ExtensionType values from RFC 5246. */ 251/* ExtensionType value from RFC 5246/RFC 8446. */
252#define TLSEXT_TYPE_signature_algorithms 13 252#define TLSEXT_TYPE_signature_algorithms 13
253 253
254/* ExtensionType value from RFC 5764. */ 254/* ExtensionType value from RFC 5764. */
@@ -266,6 +266,20 @@ extern "C" {
266/* ExtensionType value from RFC 4507. */ 266/* ExtensionType value from RFC 4507. */
267#define TLSEXT_TYPE_session_ticket 35 267#define TLSEXT_TYPE_session_ticket 35
268 268
269/* ExtensionType values from RFC 8446 section 4.2 */
270#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL)
271#define TLSEXT_TYPE_pre_shared_key 41
272#define TLSEXT_TYPE_early_data 42
273#define TLSEXT_TYPE_supported_versions 43
274#define TLSEXT_TYPE_cookie 44
275#define TLSEXT_TYPE_psk_key_exchange_modes 45
276#define TLSEXT_TYPE_certificate_authorities 47
277#define TLSEXT_TYPE_oid_filters 48
278#define TLSEXT_TYPE_post_handshake_auth 49
279#define TLSEXT_TYPE_signature_algorithms_cert 50
280#define TLSEXT_TYPE_key_share 51
281#endif
282
269/* Temporary extension type */ 283/* Temporary extension type */
270#define TLSEXT_TYPE_renegotiate 0xff01 284#define TLSEXT_TYPE_renegotiate 0xff01
271 285