Fix bug of tags.Tag09

Author: spiegel-im-spiegel

cli/gpgpdump/facade/facade.go

@@ -90,13 +90,14 @@ func getBool(cmd *cobra.Command, name string) bool {
 func parseOpt(cmd *cobra.Command) *options.Options {
 	return options.New(
 		options.Set(options.ArmorOpt, getBool(cmd, options.ArmorOpt)),
-		//options.Set(options.DebugOpt, getBool(cmd, options.DebugOpt)), //not use
 		//options.Set(options.GDumpOpt, getBool(cmd, options.GDumpOpt)), //not use
 		options.Set(options.IntegerOpt, getBool(cmd, options.IntegerOpt)),
 		options.Set(options.LiteralOpt, getBool(cmd, options.LiteralOpt)),
 		options.Set(options.MarkerOpt, getBool(cmd, options.MarkerOpt)),
 		options.Set(options.PrivateOpt, getBool(cmd, options.PrivateOpt)),
 		options.Set(options.UTCOpt, getBool(cmd, options.UTCOpt)),
+
+		//options.Set(options.DebugOpt, true), //for debug
 	)
 }
 

cli/gpgpdump/facade/facade_test.go

@@ -30,8 +30,7 @@ Symmetric-Key Encrypted Session Key Packet (tag 3) (4 bytes)
 	String-to-Key (S2K) Algorithm: Simple S2K (s2k 0)
 		Hash Algorithm: MD5 (hash 1)
 Symmetrically Encrypted Data Packet (tag 9) (56 bytes)
-	Compression Algorithm: Unknown (comp 231)
-	Compressed data (55 bytes)
+	Encrypted data (sym alg is specified in sym-key encrypted session key)
 `
 	resdataFromAscdata1 = `Signature Packet (tag 2) (94 bytes)
 	Version: 4 (new)

cli/gpgpdump/facade/json_test.go

@@ -49,12 +49,8 @@ var resJSON = `{
       "note": "56 bytes",
       "Item": [
         {
-          "name": "Compression Algorithm",
-          "value": "Unknown (comp 231)"
-        },
-        {
-          "name": "Compressed data",
-          "note": "55 bytes"
+          "name": "Encrypted data",
+          "note": "sym alg is specified in sym-key encrypted session key"
         }
       ]
     }

cli/gpgpdump/facade/toml_test.go

@@ -55,12 +55,8 @@ var (
   note = "56 bytes"
 
   [[Packet.Item]]
-    name = "Compression Algorithm"
-    value = "Unknown (comp 231)"
-
-  [[Packet.Item]]
-    name = "Compressed data"
-    note = "55 bytes"
+    name = "Encrypted data"
+    note = "sym alg is specified in sym-key encrypted session key"
 `
 	resTOMLdataFromAscdata1 = `[[Packet]]
   name = "Signature Packet (tag 2)"
@@ -174,7 +170,7 @@ func TestTOMLLoadByFile(t *testing.T) {
 	}
 	str = outBuf.String()
 	if str != resTOMLdataFromBindata1 {
-		t.Errorf("Execute(file) = \"%v\", want \"%v\".", str, resdataFromBindata1)
+		t.Errorf("Execute(file) = \"%v\", want \"%v\".", str, resTOMLdataFromBindata1)
 	}
 }
 

packet/tags/tags.go

@@ -43,7 +43,7 @@ var newFunctions = FuncMap{
 	6:  newTag06, //Public-Key Packet
 	7:  newTag07, //Secret-Subkey Packet
 	8:  newTag08, //Compressed Data Packet
-	9:  newTag08, //Symmetrically Encrypted Data Packet
+	9:  newTag09, //Symmetrically Encrypted Data Packet
 	10: newTag10, //Marker Packet (Obsolete Literal Packet)
 	11: newTag11, //Literal Data Packet
 	12: newTag12, //Trust Packet