[Openvas-commits] r5523 - in trunk/openvas-scanner: . openvassd

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Oct 13 22:52:58 CEST 2009


Author: jan
Date: 2009-10-13 22:52:57 +0200 (Tue, 13 Oct 2009)
New Revision: 5523

Modified:
   trunk/openvas-scanner/ChangeLog
   trunk/openvas-scanner/openvassd/openvassd.c
Log:
* openvassd/openvassd.c (scanner_thread): Removed handling
of SSL version being set to "none". This does not make sense
to handle. If none is specified, now the scanner will fall back
to its default as done before for any unknown SSL identifier.



Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2009-10-13 20:30:05 UTC (rev 5522)
+++ trunk/openvas-scanner/ChangeLog	2009-10-13 20:52:57 UTC (rev 5523)
@@ -1,3 +1,10 @@
+2009-10-13  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+	* openvassd/openvassd.c (scanner_thread): Removed handling
+	of SSL version being set to "none". This does not make sense
+	to handle. If none is specified, now the scanner will fall back
+	to its default as done before for any unknown SSL identifier.
+
 2009-10-13  Matthew Mundell <matthew.mundell at intevation.de>
 
 	* openvassd/comm.c: Replace category name list with ACT_STRING_LIST_ALL.

Modified: trunk/openvas-scanner/openvassd/openvassd.c
===================================================================
--- trunk/openvas-scanner/openvassd/openvassd.c	2009-10-13 20:30:05 UTC (rev 5522)
+++ trunk/openvas-scanner/openvassd/openvassd.c	2009-10-13 20:52:57 UTC (rev 5523)
@@ -383,8 +383,6 @@
  /* Close the scanner thread - it is useless for us now */
  close (global_iana_socket);
 
- if (ovas_scanner_ctx != NULL) /* ssl_ver !=  "NONE" */
-   {
      soc2 = ovas_scanner_context_attach (ovas_scanner_ctx, soc);
      if (soc2 < 0)
        goto shutdown_and_exit;
@@ -392,7 +390,6 @@
      /* FIXME: The pre-gnutls code optionally printed information about
       * the peer's certificate at this point.
       */
-   }
 
  setsockopt(soc, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt));
  /* arg_set_value *replaces* an existing value, but it shouldn't fail here */
@@ -529,8 +526,6 @@
   if (ssl_ver == NULL || *ssl_ver == '\0')
     ssl_ver = SSL_VER_DEF_NAME;
 
-  if (strcasecmp(ssl_ver, "NONE") != 0)
-    {
       if (openvas_SSL_init() < 0)
 	{
 	  fprintf(stderr, "Could not initialize openvas SSL!\n");
@@ -598,9 +593,7 @@
 	      exit (1);
 	    }
 	}
-    } /* ssl_ver != "NONE" */
 
-
   log_write("openvassd %s started\n", OPENVAS_FULL_VERSION);
   for(;;)
     {



More information about the Openvas-commits mailing list