[vlc-commits] Contribs: vncserver, disable the GnuTLS anon part

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 20 21:05:02 2016 +0100| [591430c1b4e18e07d79c496b31952ecff55751c9] | committer: Jean-Baptiste Kempf

Contribs: vncserver, disable the GnuTLS anon part

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

 contrib/src/vncserver/rules.mak             |    1 +
 contrib/src/vncserver/vnc-gnutls-anon.patch |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak
index e5accd1..5566268 100644
--- a/contrib/src/vncserver/rules.mak
+++ b/contrib/src/vncserver/rules.mak
@@ -23,6 +23,7 @@ vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz .sum-vncserver
 	$(APPLY) $(SRC)/vncserver/png-detection.patch
 	$(APPLY) $(SRC)/vncserver/vnc-gnutls-pkg.patch
 	$(APPLY) $(SRC)/vncserver/gnutls-recent.patch
+	$(APPLY) $(SRC)/vncserver/vnc-gnutls-anon.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
diff --git a/contrib/src/vncserver/vnc-gnutls-anon.patch b/contrib/src/vncserver/vnc-gnutls-anon.patch
new file mode 100644
index 0000000..dc46f1b
--- /dev/null
+++ b/contrib/src/vncserver/vnc-gnutls-anon.patch
@@ -0,0 +1,20 @@
+--- vncserver/libvncclient/tls_gnutls.c	2016-03-20 21:03:17.093404245 +0100
++++ vncserver/libvncclient/tls_gnutls.c.new	2016-03-20 21:03:56.265406113 +0100
+@@ -162,6 +162,9 @@
+   gnutls_anon_client_credentials anonCred;
+   int ret;
+ 
++  return FALSE;
++
++#if 0
+   if ((ret = gnutls_anon_allocate_client_credentials(&anonCred)) < 0 ||
+       (ret = gnutls_credentials_set((gnutls_session_t)client->tlsSession, GNUTLS_CRD_ANON, anonCred)) < 0)
+   {
+@@ -171,6 +174,7 @@
+   }
+   rfbClientLog("TLS anonymous credential created.\n");
+   return TRUE;
++#endif
+ }
+ 
+ static rfbBool