[Openvas-commits] r11697 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-09-27 09:01:49 +0200 (Tue, 27 Sep 2011)
New Revision: 11697

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
Log:
	* src/manage_sql.c (cvss_threat, prognosis_where_levels): Use the CVSS
	threat mapping from CR 42.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-09-27 06:45:07 UTC (rev 11696)
+++ trunk/openvas-manager/ChangeLog	2011-09-27 07:01:49 UTC (rev 11697)
@@ -1,5 +1,10 @@
 2011-09-27  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/manage_sql.c (cvss_threat, prognosis_where_levels): Use the CVSS
+	threat mapping from CR 42.
+
+2011-09-27  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/manage_sql.c (result_iterator_nvt_cvss_base_double): New function.
 	(result_cmp): Include CVSS base in comparison, as this was recently added
 	to the init_result_iterator sorting.

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2011-09-27 06:45:07 UTC (rev 11696)
+++ trunk/openvas-manager/src/manage_sql.c	2011-09-27 07:01:49 UTC (rev 11697)
@@ -863,9 +863,9 @@
 {
   if (cvss < 0 || cvss > 10)
     return "";
-  if (cvss < 3)
+  if (cvss < 2)
     return "Low";
-  if (cvss < 6)
+  if (cvss < 5)
     return "Medium";
   return "High";
 }
@@ -10576,22 +10576,22 @@
     return "";
 
   if (high && medium)
-    return " AND cves.cvss >= 3";
+    return " AND cves.cvss >= 2";
 
   if (high && low)
-    return " AND (cves.cvss >= 6 OR cves.cvss < 3)";
+    return " AND (cves.cvss >= 5 OR cves.cvss < 2)";
 
   if (medium && low)
-    return " AND cves.cvss < 6";
+    return " AND cves.cvss < 5";
 
   if (high)
-    return " AND cves.cvss >= 6";
+    return " AND cves.cvss >= 5";
 
   if (medium)
-    return " AND cves.cvss < 6 AND cves.cvss >= 3";
+    return " AND cves.cvss < 5 AND cves.cvss >= 2";
 
   if (low)
-    return " AND cves.cvss < 3";
+    return " AND cves.cvss < 2";
 
   return "";
 }