Provide TLSEXT_TYPE_* aliases for TLS 1.3.

OpenSSL decided to use their own names for two of the TLS 1.3 extensions,
rather than using the names given in the RFC. Provide aliases for these so
that code written to work with OpenSSL also works with LibreSSL (otherwise
everyone gets to provide their own workarounds).

Issue noted by d3x0r on github.

ok inoguchi@ tb@

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
index cb68bbb562..2230f0bab8 100644
--- a/src/lib/libssl/tls1.h
+++ b/src/lib/libssl/tls1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls1.h,v 1.39 2019/03/19 16:53:03 jsing Exp $ */
+/* $OpenBSD: tls1.h,v 1.40 2020/01/02 06:23:16 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -280,6 +280,15 @@ extern "C" {
 #define TLSEXT_TYPE_key_share                   51
 #endif
 
+/*
+ * TLS 1.3 extension names from OpenSSL, where they decided to use a different
+ * name from that given in RFC 8446.
+ */
+#if defined(LIBRESSL_HAS_TLS1_3)
+#define TLSEXT_TYPE_psk                         TLSEXT_TYPE_pre_shared_key
+#define TLSEXT_TYPE_psk_kex_modes               TLSEXT_TYPE_psk_key_exchange_modes
+#endif
+
 /* Temporary extension type */
 #define TLSEXT_TYPE_renegotiate                 0xff01