moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

http2-openssl: verify that NPN functionality is present

Browse Source
This commit is contained in:
Daniel Stenberg 2014-01-30 11:24:15 +01:00
parent 22c198fa89
commit 99b4ff8b6f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -1594,7 +1594,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then
ENGINE_cleanup \ ENGINE_cleanup \
CRYPTO_cleanup_all_ex_data \ CRYPTO_cleanup_all_ex_data \
SSL_get_shutdown \ 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 Make an attempt to detect if this is actually yassl's headers and
dnl OpenSSL emulation layer. We still leave everything else believing dnl OpenSSL emulation layer. We still leave everything else believing

6
lib/vtls/openssl.c
View File

@ -1400,6 +1400,12 @@ static void ssl_tls_trace(int direction, int ssl_ver, int content_type,
#endif #endif
#ifdef USE_NGHTTP2 #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 * 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. * the protocol we want to use from the list and write its string into out.