Commit 65ef0b68 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

gnutls: update to version 3.1.9 and simplify

parent 69a7cda1
......@@ -4064,7 +4064,7 @@ dnl
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls GNU TLS TLS/SSL support (default enabled)])
AS_IF([test "${enable_gnutls}" != "no"], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.4], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.9], [
VLC_ADD_PLUGIN([gnutls])
], [
AS_IF([test -n "${enable_gnutls}"], [
......
......@@ -8,7 +8,7 @@ ifndef HAVE_DARWIN_OS
PKGS += gnutls
endif
endif
ifeq ($(call need_pkg,"gnutls >= 3.0.20"),)
ifeq ($(call need_pkg,"gnutls >= 3.1.9"),)
PKGS_FOUND += gnutls
endif
......
......@@ -53,7 +53,7 @@ static int gnutls_Init (vlc_object_t *p_this)
goto error;
}
const char *psz_version = gnutls_check_version ("3.1.4");
const char *psz_version = gnutls_check_version ("3.1.9");
if (psz_version == NULL)
{
msg_Err (p_this, "unsupported GnuTLS version");
......@@ -183,7 +183,7 @@ static int gnutls_SessionOpen (vlc_tls_t *tls, int type,
goto error;
}
gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t)(intptr_t)fd);
gnutls_transport_set_int (session, fd);
tls->sys = session;
tls->sock.p_sys = NULL;
......
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