diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-01-30 11:24:15 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-01-30 11:24:15 +0100 |
| commit | 99b4ff8b6f6681ef1f5c2a0ccab49b95aa15b75c (patch) | |
| tree | 5d2b1596a3f3ae472e5163488a1552c770d9b65b | |
| parent | 22c198fa89512c76f916d7d3909d113bb32ddcd0 (diff) | |
http2-openssl: verify that NPN functionality is present
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/vtls/openssl.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ab9bf0376..2bc86083f 100644 --- a/configure.ac +++ b/configure.ac @@ -1594,7 +1594,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then ENGINE_cleanup \ CRYPTO_cleanup_all_ex_data \ SSL_get_shutdown \ - SSLv2_client_method ) + SSLv2_client_method \ + SSL_CTX_set_next_proto_select_cb ) dnl Make an attempt to detect if this is actually yassl's headers and dnl OpenSSL emulation layer. We still leave everything else believing diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 7374c133f..264dcf7c6 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1400,6 +1400,12 @@ static void ssl_tls_trace(int direction, int ssl_ver, int content_type, #endif #ifdef USE_NGHTTP2 + +#if !defined(HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB) || \ + defined(OPENSSL_NO_NEXTPROTONEG) +#error http2 builds require OpenSSL with NPN support +#endif + /* * in is a list of lenght prefixed strings. this function has to select * the protocol we want to use from the list and write its string into out. |