Modified values.Version (support draft version)

Author: spiegel-im-spiegel

packet/values/version.go

@@ -8,13 +8,14 @@ import (
 
 //Version - information version
 type Version struct {
-	ver byte //version number
-	cur byte //current version in RFC4880
+	ver   byte //version number
+	cur   byte //current version in RFC4880
+	draft byte //draft version in RFC4880bis
 }
 
 //NewVersion returns new Version instance
-func NewVersion(ver, cur byte) *Version {
-	return &Version{ver: ver, cur: cur}
+func NewVersion(ver, cur, draft byte) *Version {
+	return &Version{ver: ver, cur: cur, draft: draft}
 }
 
 //Number returns number of version
@@ -41,9 +42,20 @@ func (v *Version) IsCurrent() bool {
 	return v.ver == v.cur
 }
 
+//IsDraft return true if draft version
+func (v *Version) IsDraft() bool {
+	if v == nil {
+		return false
+	}
+	if v.draft == 0 {
+		return false
+	}
+	return v.ver == v.draft
+}
+
 //IsUnknown return true if unknown version
 func (v *Version) IsUnknown() bool {
-	return !v.IsOld() && !v.IsCurrent()
+	return !v.IsOld() && !v.IsCurrent() && !v.IsDraft()
 }
 
 //ToItem returns Item instance
@@ -57,6 +69,8 @@ func (v *Version) ToItem(dumpFlag bool) *info.Item {
 		note = "old"
 	case v.IsCurrent():
 		note = "current"
+	case v.IsDraft():
+		note = "draft"
 	default:
 		note = "unknown"
 	}
@@ -74,27 +88,27 @@ func (v *Version) String() string {
 
 // PubVer is Public-Key Packet Version
 func PubVer(ver byte) *Version {
-	return NewVersion(ver, 4)
+	return NewVersion(ver, 4., 5)
 }
 
 // SigVer is Signiture Packet Version
 func SigVer(ver byte) *Version {
-	return NewVersion(ver, 4)
+	return NewVersion(ver, 4, 0)
 }
 
 // OneSigVer is One-Pass Signature Packet Version
 func OneSigVer(ver byte) *Version {
-	return NewVersion(ver, 3)
+	return NewVersion(ver, 3, 0)
 }
 
 // PubSessKeyVer is Public-Key Encrypted Session Key Packet Version
 func PubSessKeyVer(ver byte) *Version {
-	return NewVersion(ver, 3)
+	return NewVersion(ver, 3, 0)
 }
 
 // SymSessKeyVer is Symmetric-Key Encrypted Session Key Packet Version
 func SymSessKeyVer(ver byte) *Version {
-	return NewVersion(ver, 4)
+	return NewVersion(ver, 4, 0)
 }
 
 /* Copyright 2016,2017 Spiegel

packet/values/version_test.go

@@ -3,7 +3,7 @@ package values
 import "testing"
 
 func TestVersionNew(t *testing.T) {
-	v := NewVersion(4, 4)
+	v := NewVersion(4, 4, 5)
 	if v.IsUnknown() {
 		t.Errorf("Version.IsUnknown = %v, want false.", v.IsUnknown())
 	}
@@ -40,7 +40,7 @@ func TestVersionOldNew(t *testing.T) {
 }
 
 func TestVersionOld(t *testing.T) {
-	v := NewVersion(3, 4)
+	v := NewVersion(3, 4, 5)
 	if v.IsUnknown() {
 		t.Errorf("Version.IsUnknown = %v, want false.", v.IsUnknown())
 	}
@@ -60,6 +60,27 @@ func TestVersionOld(t *testing.T) {
 	}
 }
 
+func TestVersionDraft(t *testing.T) {
+	v := NewVersion(5, 4, 5)
+	if v.IsUnknown() {
+		t.Errorf("Version.IsUnknown = %v, want false.", v.IsUnknown())
+	}
+
+	i := v.ToItem(true)
+	if i.Name != "Version" {
+		t.Errorf("Version.Name = \"%v\", want \"Version\".", i.Name)
+	}
+	if i.Value != "5" {
+		t.Errorf("Version.Value = \"%v\", want \"5\".", i.Value)
+	}
+	if i.Note != "draft" {
+		t.Errorf("Version.Note = \"%v\", want \"draft\"", i.Note)
+	}
+	if i.Dump != "05" {
+		t.Errorf("Version.Dump = \"%v\", want \"05\".", i.Dump)
+	}
+}
+
 func TestVersionOldNil(t *testing.T) {
 	v := (*Version)(nil)
 	if v.IsOld() {
@@ -75,7 +96,7 @@ func TestVersionToItemNil(t *testing.T) {
 }
 
 func TestVersionUnknown(t *testing.T) {
-	v := NewVersion(5, 4)
+	v := NewVersion(6, 4, 5)
 	if !v.IsUnknown() {
 		t.Errorf("Version.IsUnknown = %v, want true.", v.IsUnknown())
 	}
@@ -84,14 +105,14 @@ func TestVersionUnknown(t *testing.T) {
 	if i.Name != "Version" {
 		t.Errorf("Version.Name = \"%v\", want \"Version\".", i.Name)
 	}
-	if i.Value != "5" {
-		t.Errorf("Version.Value = \"%v\", want \"5\".", i.Value)
+	if i.Value != "6" {
+		t.Errorf("Version.Value = \"%v\", want \"6\".", i.Value)
 	}
 	if i.Note != "unknown" {
 		t.Errorf("Version.Note = \"%v\", want \"unknown\"", i.Note)
 	}
-	if i.Dump != "05" {
-		t.Errorf("Version.Dump = \"%v\", want \"05\".", i.Dump)
+	if i.Dump != "06" {
+		t.Errorf("Version.Dump = \"%v\", want \"06\".", i.Dump)
 	}
 }