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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-22 16:40:02 +0100 (Tue, 22 Nov 2011)
New Revision: 12158

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/report_formats/create_signatures
Log:
	* src/report_formats/create_signatures: Remove editable values from
	content for signing.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-11-22 15:11:58 UTC (rev 12157)
+++ trunk/openvas-manager/ChangeLog	2011-11-22 15:40:02 UTC (rev 12158)
@@ -1,5 +1,10 @@
 2011-11-22  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/report_formats/create_signatures: Remove editable values from
+	content for signing.
+
+2011-11-22  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/manage_sql.c (compare_files): New function.
 	(create_report_format): Sort the files alphabetically, to match the order
 	used in verify_report_format.

Modified: trunk/openvas-manager/src/report_formats/create_signatures
===================================================================
--- trunk/openvas-manager/src/report_formats/create_signatures	2011-11-22 15:11:58 UTC (rev 12157)
+++ trunk/openvas-manager/src/report_formats/create_signatures	2011-11-22 15:40:02 UTC (rev 12158)
@@ -42,7 +42,7 @@
     echo "  Format $name with UUID $uuid and ROWID $id"
     rm -f ${name}/${uuid}.asc
     rm -f ${uuid}
-    fore=`sqlite3 -separator '' -noheader -init "" $DB "SELECT uuid, name, extension, content_type, summary, description, '1' FROM report_formats WHERE uuid = '$uuid'" 2>/dev/null`
+    fore=`sqlite3 -separator '' -noheader -init "" $DB "SELECT uuid, extension, content_type, '1' FROM report_formats WHERE uuid = '$uuid'" 2>/dev/null`
     echo -n "$fore" > ${uuid}
     for file in `ls $name`; do
       echo "    File $name/$file"
@@ -63,7 +63,7 @@
     done
     for param in `sqlite3 -noheader -init "" $DB "SELECT ROWID FROM report_format_params WHERE report_format = $id" 2>/dev/null`; do
       echo "    Param $param"
-      back=`sqlite3 -separator '' -noheader -init "" $DB "SELECT name, value FROM report_format_params WHERE ROWID = $param" 2>/dev/null`
+      back=`sqlite3 -separator '' -noheader -init "" $DB "SELECT name FROM report_format_params WHERE ROWID = $param" 2>/dev/null`
       echo -n "$back" >> ${uuid}
       type=`sqlite3 -noheader -init "" $DB "SELECT type FROM report_format_params WHERE ROWID = $param" 2>/dev/null`
       case $type in
@@ -87,7 +87,7 @@
           exit 1
           ;;
       esac
-      back=`sqlite3 -separator '' -noheader -init "" $DB "SELECT min, max FROM report_format_params WHERE ROWID = $param" 2>/dev/null`
+      back=`sqlite3 -separator '' -noheader -init "" $DB "SELECT min, max, value FROM report_format_params WHERE ROWID = $param" 2>/dev/null`
       echo -n "$back" >> ${uuid}
       for value in `sqlite3 -noheader -init "" $DB "SELECT ROWID FROM report_format_param_options WHERE ROWID = $option" 2>/dev/null`/*; do
         echo "    Param option $value"