[Openvas-commits] r12084 - in branches/openvas-libraries-4-0: . misc

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-11-10 08:38:16 +0100 (Thu, 10 Nov 2011)
New Revision: 12084

Modified:
   branches/openvas-libraries-4-0/ChangeLog
   branches/openvas-libraries-4-0/misc/network.c
Log:
* misc/network.c (open_SSL_connection): Call
  gnutls_transport_set_lowat only for gnutls < 2.12.0 since it is
  deprecated in newer versions. Patch suggested by Stephan Kleine.
  Backport from trunk r12083.


Modified: branches/openvas-libraries-4-0/ChangeLog
===================================================================
--- branches/openvas-libraries-4-0/ChangeLog	2011-11-10 07:35:59 UTC (rev 12083)
+++ branches/openvas-libraries-4-0/ChangeLog	2011-11-10 07:38:16 UTC (rev 12084)
@@ -1,3 +1,10 @@
+2011-11-10  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* misc/network.c (open_SSL_connection): Call
+	gnutls_transport_set_lowat only for gnutls < 2.12.0 since it is
+	deprecated in newer versions. Patch suggested by Stephan Kleine.
+	Backport from trunk r12083.
+
 2011-11-07  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	* nasl/smb_crypt.h: Ensure that the license text contains the correct

Modified: branches/openvas-libraries-4-0/misc/network.c
===================================================================
--- branches/openvas-libraries-4-0/misc/network.c	2011-11-10 07:35:59 UTC (rev 12083)
+++ branches/openvas-libraries-4-0/misc/network.c	2011-11-10 07:38:16 UTC (rev 12084)
@@ -824,8 +824,10 @@
     }
 
   unblock_socket (fp->fd);
-  /* for non-blocking sockets, gnutls requires a 0 lowat value */
+  /* for non-blocking sockets, gnutls < 2.12.0 requires a 0 lowat value */
+#if GNUTLS_VERSION_NUMBER < 0x020c00
   gnutls_transport_set_lowat (fp->tls_session, 0);
+#endif
 
   gnutls_transport_set_ptr (fp->tls_session,
                             (gnutls_transport_ptr_t) GSIZE_TO_POINTER (fp->fd));