[vlc-commits] gnutls: require version 3.0.20 or later

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 25 20:13:43 2013 +0200| [55f8f754788a0ad228f53ea40706710b517e5f2a] | committer: Rémi Denis-Courmont

gnutls: require version 3.0.20 or later

With older versions, client support pretty much does not work.

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

 configure.ac          |    2 +-
 modules/misc/gnutls.c |   12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index a19039c..02331dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3896,7 +3896,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 >= 2.6.6], [
+  PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.0.20], [
     VLC_ADD_PLUGIN([gnutls])
   ], [
     AS_IF([test -n "${enable_gnutls}"], [
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index e401935..b3227c4 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -38,16 +38,6 @@
 
 #include <gnutls/gnutls.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"
 
 /*****************************************************************************
@@ -114,7 +104,7 @@ static int gnutls_Init (vlc_object_t *p_this)
         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)
     {
         msg_Err (p_this, "unsupported GnuTLS version");