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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-22 13:51:05 +0100 (Tue, 22 Nov 2011)
New Revision: 12156

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
Log:
	* src/manage_sql.c (create_report_format, verify_report_format): Remove
	name, summary, description and parameter values from content for signing.
	This insures that the trust stays the same, even if the report format is
	edited.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-11-22 07:37:44 UTC (rev 12155)
+++ trunk/openvas-manager/ChangeLog	2011-11-22 12:51:05 UTC (rev 12156)
@@ -1,5 +1,12 @@
 2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/manage_sql.c (create_report_format, verify_report_format): Remove
+	name, summary, description and parameter values from content for signing.
+	This insures that the trust stays the same, even if the report format is
+	edited.
+
+2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/manage_sql.c (iso_time): Make public.
 
 	* src/manage.h: Update header accordingly.

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2011-11-22 07:37:44 UTC (rev 12155)
+++ trunk/openvas-manager/src/manage_sql.c	2011-11-22 12:51:05 UTC (rev 12156)
@@ -30201,13 +30201,10 @@
       format = g_string_new ("");
 
       g_string_append_printf (format,
-                              "%s%s%s%s%s%s%i",
+                              "%s%s%s%i",
                               uuid,
-                              name,
                               extension,
                               content_type,
-                              summary,
-                              description,
                               global & 1);
 
       index = 0;
@@ -30223,9 +30220,8 @@
                                                                     index++)))
         {
           g_string_append_printf (format,
-                                  "%s%s%s",
+                                  "%s%s",
                                   param->name,
-                                  param->value,
                                   param->type);
 
           if (param->type_min)
@@ -30937,13 +30933,10 @@
 
           g_string_append_printf
            (format,
-            "%s%s%s%s%s%s%i",
+            "%s%s%s%i",
             report_format_iterator_uuid (&formats),
-            report_format_iterator_name (&formats),
             report_format_iterator_extension (&formats),
             report_format_iterator_content_type (&formats),
-            report_format_iterator_summary (&formats),
-            report_format_iterator_description (&formats),
             report_format_iterator_global (&formats) & 1);
 
           report_format = report_format_iterator_report_format (&formats);
@@ -30969,9 +30962,8 @@
             {
               g_string_append_printf
                (format,
-                "%s%s%s",
+                "%s%s",
                 report_format_param_iterator_name (&params),
-                report_format_param_iterator_value (&params),
                 report_format_param_iterator_type_name (&params));
 
               if (report_format_param_iterator_type_min (&params) > LLONG_MIN)