New header names.

diff --git a/shredcompare.py b/shredcompare.py
index 7ba8bded8fc7b4f7abadb17497732f0a07cb4137..fea085f2809afa406d1c279b8f2e58a0dcb1f5af 100755 (executable)
--- a/shredcompare.py
+++ b/shredcompare.py
@@ -25,8 +25,10 @@ class SHIF:
                 self.normalization.sort()
             elif tag == "Shred-Size":
                 self.shredsize = int(value)
-            elif tag == "Hash":
+            elif tag == "Hash-Method":
                 self.hash = value
+            elif tag == "Generator-Program":
+                self.generator = value
             elif tag == "Comment":
                 self.comments.append(value)
     def __check_match(self, other, attr):
@@ -165,8 +167,8 @@ if __name__ == '__main__':
     matches.sort(lambda x, y: cmp(x[0], y[0])) # by source chunk
     # OK, dump all matches.
     print "#SHIF-B 1.0"
-    print "Filter-Program: shredcompare.py 1.0"
-    print "Hash: MD5"
+    print "Merge-Program: shredcompare.py 1.0"
+    print "Hash-Method: MD5"
     print "Shred-Size: %d" % shiflist[0].shredsize
     print "Normalization:", ",".join(shiflist[0].normalization)
     print "%%"

diff --git a/shredtree.c b/shredtree.c
index 34dcc84bebc737baab7f28b3720b79acbbe84cd9..d845fda4d6f398212b6c16b468af982fd193a56c 100644 (file)
--- a/shredtree.c
+++ b/shredtree.c
@@ -222,8 +222,8 @@ main(int argc, char *argv[])
     }
 
     puts("#SHIF-A 1.0");
-    puts("Generator: shredtree 1.0");
-    puts("Hash: MD5");
+    puts("Generator-Program: shredtree 1.0");
+    puts("Hash-Method: MD5");
     printf("Shred-Size: %d\n", shredsize);
     printf("Normalization: %s\n", rws ? "remove_whitespace" : "none");
     puts("%%");

diff --git a/shredtree.py b/shredtree.py
index 6f31a048e7505f5359fb895c5c750345ce7ed4f8..5a956752b0a3f656ec4d18d023ceef44565145d5 100755 (executable)
--- a/shredtree.py
+++ b/shredtree.py
@@ -93,8 +93,8 @@ if __name__ == '__main__':
             ws = True
     if args:
         print "#SHIF-A 1.0"
-        print "Generator: shredtree.py 1.0"
-        print "Hash: MD5"
+        print "Generator-Program: shredtree.py 1.0"
+        print "Hash-Method: MD5"
         print "Shred-Size: %d" % shredsize
         normalization = []
         if ws: normalization.append("remove_whitespace")