gnutls: update to version 3.1.9 and simplify

diff --git a/configure.ac b/configure.ac
index 2be12378e04c5059bfd4273fc514f483a63dbd70..c10fded3fc9c72e73f99e6e24a437dc1afee141b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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}"], [

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index e9533d17d32178d1c9ec8d1175bc3b452b870669..a05fb07debdc54cfeb1b2f88538725619720c8ac 100644 (file)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -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
 

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index a096094e2997764491bf162c6a322aa7e5c56c00..8ef245528b3c13c9ba0dede9f7224752a6f187f5 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -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;