[vlc-commits] gnutls: update to version 3.1.9 and simplify

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 23 13:42:37 2014 +0300| [65ef0b68ea9b07132794b88f7aef91cc6eaef082] | committer: Rémi Denis-Courmont

gnutls: update to version 3.1.9 and simplify

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65ef0b68ea9b07132794b88f7aef91cc6eaef082
---

 configure.ac                 |    2 +-
 contrib/src/gnutls/rules.mak |    2 +-
 modules/misc/gnutls.c        |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2be1237..c10fded 100644
--- 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 e9533d1..a05fb07 100644
--- 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 a096094..8ef2455 100644
--- 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;