Fix Features subpacket

packet/tags/sub30.go

@@ -28,7 +28,9 @@ func (s *sub30) Parse() (*info.Item, error) {
 		return rootInfo, errs.Wrap(err, "illegal flag")
 	}
 	rootInfo.Add(values.Flag2Item(flag&0x01, "Modification Detection (packets 18 and 19)"))
-	rootInfo.Add(values.Flag2Item(flag&0xfe, fmt.Sprintf("Unknown flag1(%#02x)", flag&0xfe)))
+	rootInfo.Add(values.Flag2Item(flag&0x02, "AEAD Encrypted Data Packet (packet 20) and version 5 Symmetric-Key Encrypted Session Key Packets (packet 3)"))
+	rootInfo.Add(values.Flag2Item(flag&0x04, "Version 5 Public-Key Packet format and corresponding new fingerprint format"))
+	rootInfo.Add(values.Flag2Item(flag&0xf8, fmt.Sprintf("Unknown flag1(%#02x)", flag&0xf8)))
 	if s.reader.Rest() > 0 {
 		flags, _ := s.reader.Read2EOF()
 		for i, flag := range flags {

packet/tags/tag02_test.go

@@ -281,7 +281,8 @@ const (
 		Features (sub 30) (1 bytes)
 			07
 			Flag: Modification Detection (packets 18 and 19)
-			Flag: Unknown flag1(0x06)
+			Flag: AEAD Encrypted Data Packet (packet 20) and version 5 Symmetric-Key Encrypted Session Key Packets (packet 3)
+			Flag: Version 5 Public-Key Packet format and corresponding new fingerprint format
 		Key Server Preferences (sub 23) (1 bytes)
 			80
 			Flag: No-modify

testdata/aead/pubkey.asc

@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+uCAU7bE=
+=3/Gk
+-----END PGP PUBLIC KEY BLOCK-----

testdata/aead/seckey.asc

@@ -0,0 +1,65 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+=4P2v
+-----END PGP PRIVATE KEY BLOCK-----