Commit 55f8f754 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

gnutls: require version 3.0.20 or later

With older versions, client support pretty much does not work.
parent eff236e4
...@@ -3896,7 +3896,7 @@ dnl ...@@ -3896,7 +3896,7 @@ dnl
AC_ARG_ENABLE(gnutls, AC_ARG_ENABLE(gnutls,
[ --enable-gnutls GNU TLS TLS/SSL support (default enabled)]) [ --enable-gnutls GNU TLS TLS/SSL support (default enabled)])
AS_IF([test "${enable_gnutls}" != "no"], [ AS_IF([test "${enable_gnutls}" != "no"], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.6.6], [ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.0.20], [
VLC_ADD_PLUGIN([gnutls]) VLC_ADD_PLUGIN([gnutls])
], [ ], [
AS_IF([test -n "${enable_gnutls}"], [ AS_IF([test -n "${enable_gnutls}"], [
......
...@@ -38,16 +38,6 @@ ...@@ -38,16 +38,6 @@
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/x509.h> #include <gnutls/x509.h>
#if (GNUTLS_VERSION_NUMBER < 0x030014)
# define gnutls_certificate_set_x509_system_trust(c) \
(c, GNUTLS_E_UNIMPLEMENTED_FEATURE)
#endif
#if (GNUTLS_VERSION_NUMBER < 0x03000D)
# define gnutls_verify_stored_pubkey(db,tdb,host,serv,ctype,cert,fl) \
(db, host, serv, ctype, cert, fl, GNUTLS_E_NO_CERTIFICATE_FOUND)
# define gnutls_store_pubkey(db,tdb,host,serv,ctype,cert,e,fl) \
(db, host, serv, ctype, cert, fl, GNUTLS_E_UNIMPLEMENTED_FEATURE)
#endif
#include "dhparams.h" #include "dhparams.h"
/***************************************************************************** /*****************************************************************************
...@@ -114,7 +104,7 @@ static int gnutls_Init (vlc_object_t *p_this) ...@@ -114,7 +104,7 @@ static int gnutls_Init (vlc_object_t *p_this)
goto error; goto error;
} }
const char *psz_version = gnutls_check_version ("2.6.6"); const char *psz_version = gnutls_check_version ("3.0.20");
if (psz_version == NULL) if (psz_version == NULL)
{ {
msg_Err (p_this, "unsupported GnuTLS version"); msg_Err (p_this, "unsupported GnuTLS version");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment