From f7f1c50494419cff99039bd4cb96ae0730888a4a Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaronmdjones@gmail.com>
Date: Sun, 8 Sep 2019 13:59:52 +0000
Subject: [PATCH] Support ECDH X25519 for TLSv1.3 (OpenSSL 1.1.1)

---
 librb/src/openssl_ratbox.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/librb/src/openssl_ratbox.h b/librb/src/openssl_ratbox.h
index bbb5cf6a..130d8096 100644
--- a/librb/src/openssl_ratbox.h
+++ b/librb/src/openssl_ratbox.h
@@ -87,6 +87,14 @@
 #  endif
 #endif
 
+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10101000L)
+#  define LRB_HAVE_TLS_ECDH_X25519      1
+#else
+#  if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER > 0x2050100fL)
+#    define LRB_HAVE_TLS_ECDH_X25519    1
+#  endif
+#endif
+
 
 
 /*
@@ -123,7 +131,11 @@ static const char rb_default_ciphers[] = ""
 	"!aNULL";
 
 #ifdef LRB_HAVE_TLS_SET_CURVES
-static const char rb_default_curves[] = "P-521:P-384:P-256";
+#  ifdef LRB_HAVE_TLS_ECDH_X25519
+static char rb_default_curves[] = "X25519:P-521:P-384:P-256";
+#  else
+static char rb_default_curves[] = "P-521:P-384:P-256";
+#  endif
 #endif
 
 #endif /* LRB_OPENSSL_H_INC */