Merge pull request #19 from spiegel-im-spiegel/support-rfc4880bis

Support rfc4880bis

Author: spiegel-im-spiegel

README.md

@@ -8,7 +8,7 @@
 
 - Based on [pgpdump](https://github.com/kazu-yamamoto/pgpdump)
 - Provide [golang](https://golang.org/) package and command-line Interface
-- Output with [TOML](https://github.com/toml-lang/toml) (or [JSON](https://tools.ietf.org/html/rfc7159)) format
+- Output with plain text, [TOML](https://github.com/toml-lang/toml), and [JSON](https://tools.ietf.org/html/rfc7159) format
 - Support [RFC 5581] and [RFC 6637]
 
 ## Install

packet/pubkey/parse_secplain.go

@@ -46,14 +46,14 @@ func (p *Pubkey) ParseSecPlain(parent *info.Item) error {
 			info.DumpStr(values.DumpBytes(b, p.cxt.Debug()).String()),
 		))
 	}
-	switch p.reader.Rest() {
-	case 2: //checksum
-		parent.Add(values.RawData(p.reader, "Checksum", true))
-	case 20: //SHA-1 hash
-		parent.Add(values.RawData(p.reader, "SHA-1 hash", true))
-	default:
-		parent.Add(values.RawData(p.reader, "Other hash", true))
+	chk, err := p.reader.ReadBytes(2)
+	if err != nil {
+		return errors.Wrap(err, "error in pubkey.Pubkey.ParseSecPlain() function (Checksum)")
 	}
+	parent.Add(info.NewItem(
+		info.Name("Checksum"),
+		info.DumpStr(values.DumpBytes(chk, true).String()),
+	))
 	return nil
 }
 
@@ -126,7 +126,7 @@ func (p *Pubkey) eddsaSec(item *info.Item) error {
 	return nil
 }
 
-/* Copyright 2016 Spiegel
+/* Copyright 2016-2018 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packet/tags/pubkey.go

@@ -119,7 +119,7 @@ func (p *pubkeyInfo) parseV5(parent *info.Item) error {
 		return errors.Wrap(err, "error in tags.pubkey,parseV5() function (key material data)")
 	}
 	// [10] series of multiprecision integers comprising the key material.
-	return pubkey.New(p.cxt, p.pubID, reader.New(b)).ParsePub(parent)
+	return pubkey.New(p.cxt, p.pubID, reader.New(b)).ParsePub(parent) //TODO: new logic for key material
 }
 
 //PubID returns pubID

packet/tags/seckey.go

@@ -35,7 +35,7 @@ func (p *seckeyInfo) Parse(parent *info.Item) error {
 	switch sid {
 	case 0:
 		parent.Note = "the secret-key data is not encrypted."
-		parent.Add(p.pubVer.ToItem(p.cxt.Debug()))
+		//parent.Add(p.pubVer.ToItem(p.cxt.Debug()))
 		if !p.pubVer.IsUnknown() {
 			if err := pubkey.New(p.cxt, p.pubID, p.reader).ParseSecPlain(parent); err != nil {
 				return err

packet/tags/sub27.go

@@ -20,6 +20,8 @@ func newSub27(cxt *context.Context, subID values.SuboacketID, body []byte) Subs
 // Parse parsing Key Flags Sub-packet
 func (s *sub27) Parse() (*info.Item, error) {
 	rootInfo := s.subID.ToItem(s.reader, s.cxt.Debug())
+
+	//First octet
 	flag, err := s.reader.ReadByte()
 	if err != nil {
 		return nil, err
@@ -32,6 +34,18 @@ func (s *sub27) Parse() (*info.Item, error) {
 	rootInfo.Add(values.Flag2Item(flag&0x20, "This key may be used for authentication."))
 	rootInfo.Add(values.Flag2Item(flag&0x40, fmt.Sprintf("Unknown flag1(%#02x)", flag&0x40)))
 	rootInfo.Add(values.Flag2Item(flag&0x80, "The private component of this key may be in the possession of more than one person."))
+
+	//second octet
+	if s.reader.Rest() > 0 {
+		flag, err := s.reader.ReadByte()
+		if err != nil {
+			return nil, err
+		}
+		rootInfo.Add(values.Flag2Item(flag&0x04, "This key may be used as an additional decryption subkey (ADSK)."))
+		rootInfo.Add(values.Flag2Item(flag&0xfb, fmt.Sprintf("Unknown flag2(%#02x)", flag&0xfb)))
+	}
+
+	//other flags
 	if s.reader.Rest() > 0 {
 		flags, _ := s.reader.Read2EOF()
 		for i, flag := range flags {

packet/tags/sub34.go

@@ -7,21 +7,21 @@ import (
 	"github.com/spiegel-im-spiegel/gpgpdump/packet/values"
 )
 
-//subReserved class for Reserved Sub-packet
+//subReserved class for Preferred AEAD Algorithms Sub-packet
 type sub34 subInfo
 
-//newSubReserved return subReserved instance
+//newSubReserved return sub34 instance
 func newSub34(cxt *context.Context, subID values.SuboacketID, body []byte) Subs {
 	return &sub34{cxt: cxt, subID: subID, reader: reader.New(body)}
 }
 
-// Parse parsing Reserved Sub-packet
+// Parse parsing Preferred AEAD Algorithms Sub-packet
 func (s *sub34) Parse() (*info.Item, error) {
 	rootInfo := s.subID.ToItem(s.reader, s.cxt.Debug())
 	return rootInfo, nil
 }
 
-/* Copyright 2016 Spiegel
+/* Copyright 2018 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packet/tags/subs.go

@@ -81,7 +81,7 @@ func NewSubs(cxt *context.Context, osp *openpgp.OpaqueSubpacket, tagID values.Ta
 	return nil
 }
 
-/* Copyright 2016 Spiegel
+/* Copyright 2016-2018 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packet/tags/tag01.go

@@ -43,6 +43,10 @@ func (t *tag01) Parse() (*info.Item, error) {
 	if err := pubkey.New(t.cxt, values.PubID(pubid), t.reader).ParseSes(rootInfo); err != nil {
 		return rootInfo, err
 	}
+
+	if t.reader.Rest() > 0 {
+		rootInfo.Add(values.RawData(t.reader, "Unknown data", t.cxt.Debug()))
+	}
 	return rootInfo, nil
 }
 

packet/tags/tag01_test.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/spiegel-im-spiegel/gpgpdump/options"
 	"github.com/spiegel-im-spiegel/gpgpdump/packet/context"
+	"github.com/spiegel-im-spiegel/gpgpdump/packet/reader"
+	"github.com/spiegel-im-spiegel/gpgpdump/packet/values"
 
 	openpgp "golang.org/x/crypto/openpgp/packet"
 )
@@ -29,30 +31,45 @@ const (
 )
 
 func TestTag01(t *testing.T) {
-	op := &openpgp.OpaquePacket{Tag: 1, Contents: tag01Body}
-	cxt := context.NewContext(options.New(
-		options.Set(options.DebugOpt, true),
-		options.Set(options.IntegerOpt, true),
-		options.Set(options.MarkerOpt, true),
-		options.Set(options.LiteralOpt, true),
-		options.Set(options.PrivateOpt, true),
-		options.Set(options.UTCOpt, true),
-	))
-	i, err := NewTag(op, cxt).Parse()
-	if err != nil {
-		t.Errorf("NewTag() = %v, want nil error.", err)
-		return
+	testCases := []struct {
+		tag     uint8
+		content []byte
+		ktm     []byte
+		cxt     context.SymAlgMode
+		res     string
+	}{
+		{tag: 1, content: tag01Body, ktm: nil, cxt: context.ModePubEnc, res: tag01Redult},
 	}
-	if cxt.AlgMode() != context.ModePubEnc {
-		t.Errorf("Options.Mode = %v, want \"%v\".", cxt.AlgMode(), context.ModePubEnc)
-	}
-	str := i.String()
-	if str != tag01Redult {
-		t.Errorf("Tag.String = \"%s\", want \"%s\".", str, tag01Redult)
+	for _, tc := range testCases {
+		op := &openpgp.OpaquePacket{Tag: tc.tag, Contents: tc.content}
+		cxt := context.NewContext(options.New(
+			options.Set(options.DebugOpt, true),
+			options.Set(options.IntegerOpt, true),
+			options.Set(options.MarkerOpt, true),
+			options.Set(options.LiteralOpt, true),
+			options.Set(options.PrivateOpt, true),
+			options.Set(options.UTCOpt, true),
+		))
+		if tc.ktm != nil {
+			tm, _ := values.NewDateTime(reader.New(tc.ktm), cxt.UTC())
+			cxt.KeyCreationTime = tm
+		}
+		i, err := NewTag(op, cxt).Parse()
+		if err != nil {
+			t.Errorf("NewTag() = %v, want nil error.", err)
+			return
+		}
+		if cxt.AlgMode() != tc.cxt {
+			t.Errorf("Options.Mode = %v, want \"%v\".", cxt.AlgMode(), tc.cxt)
+		}
+		res := i.String()
+		if res != tc.res {
+			t.Errorf("Tag.String = \"%s\", want \"%s\".", res, tc.res)
+		}
 	}
 }
 
-/* Copyright 2017 Spiegel
+/* Copyright 2017,2018 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packet/tags/tag02.go

@@ -47,7 +47,7 @@ func (t *tag02) Parse() (*info.Item, error) {
 	}
 
 	if t.reader.Rest() > 0 {
-		rootInfo.Add(values.RawData(t.reader, "Rest", t.cxt.Debug()))
+		rootInfo.Add(values.RawData(t.reader, "Unknown data", t.cxt.Debug()))
 	}
 	return rootInfo, nil
 }