From: Guenter Knauf <lists@gknw.net>
Date: Tue, 28 Oct 2014 23:56:48 +0000 (+0100)
Subject: Check for ALPN via OpenSSL version number.
X-Git-Tag: curl-7_39_0~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e42e3a4facfca971b5e09e8351312946ccb25e79;p=thirdparty%2Fcurl.git

Check for ALPN via OpenSSL version number.

This check works also with to non-configure platforms.
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index f42ebd8967..87f88879cc 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1420,17 +1420,13 @@ static void ssl_tls_trace(int direction, int ssl_ver, int content_type,
 
 #ifdef USE_NGHTTP2
 
+/* Check for OpenSSL 1.0.2 which has ALPN support. */
 #undef HAS_ALPN
-#if defined(HAVE_SSL_CTX_SET_ALPN_PROTOS) && \
-  defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
-#  define HAS_ALPN 1
-#endif
-
-#if !defined(HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB) || \
-  defined(OPENSSL_NO_NEXTPROTONEG)
-#  if !defined(HAS_ALPN)
-#    error http2 builds require OpenSSL with NPN or ALPN support
-#  endif
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_NEXTPROTONEG) \
+    && !defined(OPENSSL_NO_TLSEXT)
+#  define HAS_ALPN
+#else
+#  error http2 builds require OpenSSL with NPN or ALPN support
 #endif