[Openvas-commits] r11687 - in trunk/openvas-plugins: . scripts

[scm-commit@wald.intevation.org]

Author: hdoreau
Date: 2011-09-26 14:24:43 +0200 (Mon, 26 Sep 2011)
New Revision: 11687

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/gb_openssl_detect_lin.nasl
   trunk/openvas-plugins/scripts/gb_openssl_detect_win.nasl
Log:
* scripts/gb_openssl_detect_win.nasl: Directly build and register the
CPE for OpenSSL.

* scripts/gb_openssl_detect_lin.nasl: Updated regexp to produce a
valid CPE (avoid suffix letter duplication).


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2011-09-26 08:51:23 UTC (rev 11686)
+++ trunk/openvas-plugins/ChangeLog	2011-09-26 12:24:43 UTC (rev 11687)
@@ -1,3 +1,11 @@
+2011-09-06  Henri Doreau <henri.doreau at greenbone.net>
+
+	* scripts/gb_openssl_detect_win.nasl: Directly build and register the
+	CPE for OpenSSL.
+
+	* scripts/gb_openssl_detect_lin.nasl: Updated regexp to produce a
+	valid CPE (avoid suffix letter duplication).
+
 2011-09-22  Veerendra G.G <veerendragg at secpod.com>,
 
 	* scripts/secpod_colasoft_capsa_snmp_dos_vuln.nasl,

Modified: trunk/openvas-plugins/scripts/gb_openssl_detect_lin.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_openssl_detect_lin.nasl	2011-09-26 08:51:23 UTC (rev 11686)
+++ trunk/openvas-plugins/scripts/gb_openssl_detect_lin.nasl	2011-09-26 12:24:43 UTC (rev 11687)
@@ -73,7 +73,7 @@
     ssh_close_connection();
    
     ## build cpe and store it as host_detail
-    cpe = build_cpe(value:sslVer[1], exp:"^([0-9.]+([a-z0-9]+)?)", base:"cpe:/a:openssl:openssl:");
+    cpe = build_cpe(value:sslVer[1], exp:"^([0-9.]+[a-z0-9]*)", base:"cpe:/a:openssl:openssl:");
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 

Modified: trunk/openvas-plugins/scripts/gb_openssl_detect_win.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_openssl_detect_win.nasl	2011-09-26 08:51:23 UTC (rev 11686)
+++ trunk/openvas-plugins/scripts/gb_openssl_detect_win.nasl	2011-09-26 12:24:43 UTC (rev 11687)
@@ -78,9 +78,7 @@
       security_note(data:"OpenSSL version " + ver[0] + " was detected on the host");
    
       ## build cpe and store it as host_detail
-      cpe = build_cpe(value:ver[0], exp:"^([0-9.]+([a-z0-9]+)?)", base:"cpe:/a:openssl:openssl:");
-      if(!isnull(cpe))
-         register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
+      register_host_detail(name:"App", value:string("cpe:/a:openssl:openssl:", ver[0]), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
     }
     exit(0);