diff options
| author | Marcus Hoffmann <m.hoffmann@cartelsol.com> | 2017-01-11 14:42:41 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-01-13 09:54:55 +0100 |
| commit | 7ba8020c467936283661357d21fe142f2bc48933 (patch) | |
| tree | 51fa6f05c12cb7013879c121546467c9b2e86512 | |
| parent | 1d4202ade602dd4f1192c69aed5cc905e7a9b4e2 (diff) | |
gnutls: check for alpn and ocsp in configure
Check for presence of gnutls_alpn_* and gnutls_ocsp_* functions during
configure instead of relying on the version number. GnuTLS has options
to turn these features off and we ca just work with with such builds
like we work with older versions.
Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
Closes #1204
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/vtls/gtls.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 65dac55bc..fa44787ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1847,7 +1847,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) fi fi - AC_CHECK_FUNCS(gnutls_certificate_set_x509_key_file2) + AC_CHECK_FUNCS([gnutls_certificate_set_x509_key_file2 gnutls_alpn_set_protocols gnutls_ocsp_req_init]) fi fi diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 2b539380d..a992f9994 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -92,11 +92,11 @@ static bool gtls_inited = FALSE; # define GNUTLS_MAPS_WINSOCK_ERRORS 1 # endif -# if (GNUTLS_VERSION_NUMBER >= 0x030200) +# if HAVE_GNUTLS_ALPN_SET_PROTOCOLS # define HAS_ALPN # endif -# if (GNUTLS_VERSION_NUMBER >= 0x03020d) +# if HAVE_GNUTLS_OCSP_REQ_INIT # define HAS_OCSP # endif |