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

[scm-commit@wald.intevation.org]

Author: edjenguele
Date: 2009-04-05 00:29:39 +0200 (Sun, 05 Apr 2009)
New Revision: 3025

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/remote-MS05-004.nasl
   trunk/openvas-plugins/scripts/remote-MS07-040.nasl
Log:
used revcomp for remote-MS05-004.nasl plugin, 
code format for remote-MS07-040.nasl script.


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-04-04 19:58:10 UTC (rev 3024)
+++ trunk/openvas-plugins/ChangeLog	2009-04-04 22:29:39 UTC (rev 3025)
@@ -1,3 +1,9 @@
+2009-05-04 Christian Eric Edjenguele <christian.edjenguele at owasp.org>	
+	* scripts/remote-MS07-040.nasl
+	* scripts/remote-MS05-004.nasl:
+	also used revcomp forremote-MS05-004.nasl plugin, minor change in
+	remote-MS07-040.nasl script.
+
 2009-04-04 Christian Eric Edjenguele <christian.edjenguele at owasp.org>	
 	* scripts/remote-detect-sybase-easerver-mgmt.nasl
 	* scripts/remote-MS07-040.nasl

Modified: trunk/openvas-plugins/scripts/remote-MS05-004.nasl
===================================================================
--- trunk/openvas-plugins/scripts/remote-MS05-004.nasl	2009-04-04 19:58:10 UTC (rev 3024)
+++ trunk/openvas-plugins/scripts/remote-MS05-004.nasl	2009-04-04 22:29:39 UTC (rev 3025)
@@ -124,6 +124,8 @@
 # The script code starts here
 #
 
+include("revisions-lib.inc");
+
 dotnet = get_kb_item("dotNET/version"); 
 port = get_kb_item("dotNet/port");
 
@@ -132,30 +134,19 @@
 
 else
 {
-	dotnetlist = split(dotnet, sep:'.');
-	# check if this return the list length	
-	l = max_index(dotnetlist) - 1;
-	
 	# Microsoft .Net Framework version 1.0
-    	dotnetversion['1.0.one'] = ( dotnetlist[0] == '1' && dotnetlist[1] == '0' && int(dotnetlist[2]) < 3705 );
-    	dotnetversion['1.0.two'] = ( l > 3 && dotnetlist[0] == '1' && dotnetlist[1] == '0' && int(dotnetlist[2]) == 3705 && 
-					int(dotnetlist[3]) < 6021 && int(dotnetlist[3]) > 1000 );
-    	dotnetversion['1.0.three'] = ( l > 3 && dotnetlist[0] == 1 && dotnetlist[1] == 0 && dotnetlist[2] == 3705 && dotnetlist[3] < 556 );
+	dotnetversion['1.0'] = revcomp(a:dotnet, b:"1.0.3705.6021");
+		
+	# Microsoft .Net Framework 1.1
+	dotnetversion['1.1'] = revcomp(a:dotnetVersion, b:"1.1.4322.2037");
 
-	# Microsoft .Net Framework version 1.1 
-    	dotnetversion['1.1.one'] = ( dotnetlist[0] == '1' && dotnetlist[1] == '1' && int(dotnetlist[2]) < 4322 );
-    	dotnetversion['1.1.two'] = ( l > 3 && dotnetlist[0] == '1' && dotnetlist[1] == '1' && int(dotnetlist[2]) == 4322 && 
-					int(dotnetlist[3]) < 2037 && int(dotnetlist[3]) > 2000 );
-    	dotnetversion['1.1.three'] = ( l > 3 && dotnetlist[0] == '1' && dotnetlist[1] == '1' && int(dotnetlist[2]) == 4322 && 
-					int(dotnetlist[3]) < 1085 );
-
 	foreach version (dotnetversion)
 	{
 
-	    	if (version == TRUE)
+	    	if (version == -1){
 		    	# Report 'Microsoft ASP.NET Path Validation Vulnerability (MS05-004)'
-        		report = 'Detected Microsoft .Net Framework version: ' + dotnet;
+        		report = 'Missing MS05-004 patch, detected Microsoft .Net Framework version: ' + dotnet;
 			security_hole(port:port, data:report);
+		}
 	}
 }
-

Modified: trunk/openvas-plugins/scripts/remote-MS07-040.nasl
===================================================================
--- trunk/openvas-plugins/scripts/remote-MS07-040.nasl	2009-04-04 19:58:10 UTC (rev 3024)
+++ trunk/openvas-plugins/scripts/remote-MS07-040.nasl	2009-04-04 22:29:39 UTC (rev 3025)
@@ -95,10 +95,11 @@
 	foreach version (dotnetversion)
 	{
 
-	    	if (version == -1)
+	    	if (version == -1){
 		
 			# report MS07-04 vulnerability
 		    	report  = 'Missing MS07-040 patch, detected Microsoft .Net Framework version: ' + dotnet;
 			security_hole(port:port, data:report);
+		}
 	}
 }