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

[scm-commit@wald.intevation.org]

Author: jan
Date: 2010-06-02 16:13:26 +0200 (Wed, 02 Jun 2010)
New Revision: 7887

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/cpe.inc
Log:
* scripts/cpe.inc: Fixed broken CPE entries.



Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2010-06-02 12:47:47 UTC (rev 7886)
+++ trunk/openvas-plugins/ChangeLog	2010-06-02 14:13:26 UTC (rev 7887)
@@ -1,3 +1,7 @@
+2010-06-02  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+	* scripts/cpe.inc: Fixed broken CPE entries.
+
 2010-06-02  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	Updated IT-Grundschutz NVTs with new and updated NVTs provided by

Modified: trunk/openvas-plugins/scripts/cpe.inc
===================================================================
--- trunk/openvas-plugins/scripts/cpe.inc	2010-06-02 12:47:47 UTC (rev 7886)
+++ trunk/openvas-plugins/scripts/cpe.inc	2010-06-02 14:13:26 UTC (rev 7887)
@@ -201,7 +201,7 @@
 "SurgeMail/Ver", "^([0-9.]+([a-z0-9])?)", "cpe:/a:netwin:surgemail:",
 "SolarWinds/TFTP/Ver", "^([0-9.]+)", "cpe:/a:solarwinds:tftp_server:",
 "StrongSwan/Ver", "^([0-9.]+)", "cpe:/a:strongswan:strongswan:",
-"Tor/Linux/Ver", "^([0-9.]+-?([a-z0-9]+)?)", " cpe:/a:tor:tor:",
+"Tor/Linux/Ver", "^([0-9.]+-?([a-z0-9]+)?)", "cpe:/a:tor:tor:",
 "Tor/Win/Ver", "^([0-9.]+)-?([a-z0-9]+)?", "cpe:/a:tor:tor:",
 "WoWRaidManager/Ver", "^([0-9.]+)", "cpe:/a:wowraidmanager:wowraidmanager:",
 "WinFTP/Server/Ver", "^([0-9.]+)", "cpe:/a:wftpserver:winftp_ftp_server:",
@@ -335,7 +335,7 @@
 "Kaspersky/AV-Workstation/Ver", "^(6\.0)", "cpe:/a:kaspersky_lab:kaspersky_anti-virus:6.0::workstations",
 "Kaspersky/AV-FileServer/Ver",  "^(6\.0)", "cpe:/a:kaspersky_lab:kaspersky_anti-virus:6.0.3.837::windows_file_servers:",
 "Kaspersky/IntNetSec/Ver", "^(7\..*)", "cpe:/a:kaspersky_lab:kaspersky_internet_security:",
-"Kaspersky/IntNetSec/Ver", "^(8\..*)", " cpe:/a:kaspersky_lab:kaspersky_internet_security_2009:", 
+"Kaspersky/IntNetSec/Ver", "^(8\..*)", "cpe:/a:kaspersky_lab:kaspersky_internet_security_2009:", 
 "Kaspersky/IntNetSec/Ver", "^(9\..*)", "cpe:/a:kaspersky_lab:kaspersky_internet_security_2010:",
 "Kaspersky/AV/Ver", "^(9\..*)", "cpe:/a:kaspersky:kaspersky_anti-virus:2010",
 "Kaspersky/AV/Ver", "^(8\..*)", "cpe:/a:kaspersky:kaspersky_anti-virus:2009",
@@ -355,7 +355,7 @@
 "MS/Office/Ver", "^(10\..*)", "cpe:/a:microsoft:office:2002",
 "MS/Office/Ver", "^(11\..*)", "cpe:/a:microsoft:office:2003",
 "MS/Office/Ver", "^(12\..*)", "cpe:/a:microsoft:office:2007",
-"MS/Office/Viewer/Ver", "^([0-9.]+)", " ",
+"MS/Office/Viewer/Ver", "^([0-9.]+)", "",
 "MagicISOMaker/Ver", "^([0-9]\.[0-9])", "cpe:/a:magic_iso_maker:magic_iso_maker:",
 "Maxthon/Ver", "^([0-9.]+)", "cpe:/a:maxthon:maxthon_browser:",
 "McAfee/GroupShield/Exchange/Ver", "^([0-9.]+)", "cpe:/a:mcafee:groupshield:",
@@ -820,9 +820,9 @@
 "Ipswitch/WS_FTP_Pro/Client/Ver", "^([0-9.]+)", "cpe:/a:ipswitch:ws_ftp:12.0:",
 "TrellianFTP/Version", "^([0-9.]+)", "cpe:/a:trellian:ftp:",
 "aMSN/Win/Ver", "^([0-9.]+)", "cpe:/a:amsn:amsn:",
-"www/*/Siestta", "^([0-9.]+)", "a:ramoncastro:siestta:",
-"www/*/PmWiki", "^([0-9.]+)", "a:pmwiki:pmwiki:",
-"Aria2/Ver", "^([0-9.]+)", "a:tatsuhiro_tsujikawa:aria2:",
+"www/*/Siestta", "^([0-9.]+)", "cpe:/a:ramoncastro:siestta:",
+"www/*/PmWiki", "^([0-9.]+)", "cpe:/a:pmwiki:pmwiki:",
+"Aria2/Ver", "^([0-9.]+)", "cpe:/a:tatsuhiro_tsujikawa:aria2:",
 "www/*/OpenMairie/Open_Annuaire", "^([0-9.]+)", "cpe:/a:openmairie:openannuaire:",
 "www/*/OpenMairie/Open_Courrier", "^([0-9.]+)", "cpe:/a:openmairie:opencourrier:",
 "www/*/OpenMairie/Open_Presse", "^([0-9.]+)", "cpe:/a:openmairie:openpresse:",
@@ -834,7 +834,7 @@
 "www/*/OpenMairie/Open_Cimetiere", "^([0-9.]+)", "cpe:/a:openmairie:opencimetiere:",
 "www/*/TaskFreak", "^([0-9.]+)", "cpe:/a:taskfreak:taskfreak%21:",
 "www/*/Vmaware/SSTC/Runtime", "^([0-9.]+)", "cpe:/a:vmware:tc_server:",
-"www/*/DataTrack_Ststem", "^([0-9.]+)", "a:magnoware:datatrack_system:",
+"www/*/DataTrack_Ststem", "^([0-9.]+)", "cpe:/a:magnoware:datatrack_system:",
 "www/*/OCS_Inventory_NG", "^([0-9.]+)", "cpe:/a:ocsinventory-ng:ocs_inventory_ng:",
 "www/*//HP/OVNNM/Ver", "^([0-9.]+)", "cpe:/a:hp:openview_network_node_manager:",
 "Mathematica/Ver", "^([0-9.]+)", "cpe:/a:wolfram_research:mathematica:"