[Openvas-commits] r231 - in trunk/openvas-libraries: . libopenvas

[scm-commit@wald.intevation.org]

Author: bh
Date: 2007-06-20 19:45:55 +0200 (Wed, 20 Jun 2007)
New Revision: 231

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/libopenvas/network.c
Log:
* libopenvas/network.c (open_SSL_connection): Better error
handling for the gnutls function calls.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2007-06-20 17:22:00 UTC (rev 230)
+++ trunk/openvas-libraries/ChangeLog	2007-06-20 17:45:55 UTC (rev 231)
@@ -1,5 +1,10 @@
 2007-06-20  Bernhard Herzog  <bh at intevation.de>
 
+	* libopenvas/network.c (open_SSL_connection): Better error
+	handling for the gnutls function calls.
+
+2007-06-20  Bernhard Herzog  <bh at intevation.de>
+
 	* libopenvas/network.c: Keep a pointer to the gnutls credentials
 	struct so that it can be freed properly:
 	(struct nessus_connection): New member tls_cred

Modified: trunk/openvas-libraries/libopenvas/network.c
===================================================================
--- trunk/openvas-libraries/libopenvas/network.c	2007-06-20 17:22:00 UTC (rev 230)
+++ trunk/openvas-libraries/libopenvas/network.c	2007-06-20 17:45:55 UTC (rev 231)
@@ -685,7 +685,12 @@
 
   nessus_SSL_init(NULL);
 
-  gnutls_init (&(fp->tls_session), GNUTLS_CLIENT);
+  ret = gnutls_init (&(fp->tls_session), GNUTLS_CLIENT);
+  if (ret < 0)
+    {
+      tlserror("gnutls_init", ret);
+      return -1;
+    }
 
   switch (fp->transport)
     {
@@ -714,8 +719,19 @@
       break;
     }
 
-  gnutls_certificate_allocate_credentials(&fp->tls_cred);
-  gnutls_credentials_set(fp->tls_session, GNUTLS_CRD_CERTIFICATE, fp->tls_cred);
+  ret = gnutls_certificate_allocate_credentials(&(fp->tls_cred));
+  if (ret < 0)
+    {
+      tlserror("gnutls_certificate_allocate_credentials", ret);
+      return -1;
+    }
+  ret = gnutls_credentials_set(fp->tls_session, GNUTLS_CRD_CERTIFICATE,
+			       fp->tls_cred);
+  if (ret < 0)
+    {
+      tlserror("gnutls_credentials_set", ret);
+      return -1;
+    }
 
   if (cert != NULL && key != NULL)
     {