Add missing optional tags

Some fields have default values, which also means they should be treated
as optional. Fix up the tagging to handle that. The natural defaults
here will work, so no need to make them explicit.
This commit is contained in:
Matthew Garrett 2020-11-17 12:00:54 -08:00 committed by Matthew Garrett
parent 4ad1cc2bf5
commit 3cc596e3c6

View File

@ -320,7 +320,7 @@ type TCGCredentialType struct {
type FipsLevel struct { type FipsLevel struct {
Version string Version string
Level asn1.Enumerated Level asn1.Enumerated
Plus bool Plus bool `asn1:"optional,default=false"`
} }
type CommonCriteriaMeasures struct { type CommonCriteriaMeasures struct {
@ -336,11 +336,11 @@ type CommonCriteriaMeasures struct {
} }
type TBBSecurityAssertions struct { type TBBSecurityAssertions struct {
Version int Version int `asn1:"optional,default=0"`
CcInfo CommonCriteriaMeasures `asn1:"optional,tag:0"` CcInfo CommonCriteriaMeasures `asn1:"optional,tag:0"`
FipsLevel FipsLevel `asn1:"optional,tag:1"` FipsLevel FipsLevel `asn1:"optional,tag:1"`
RtmType asn1.Enumerated `asn1:"optional,tag:2"` RtmType asn1.Enumerated `asn1:"optional,tag:2"`
Iso9000Certified bool `asn1:"optional"` Iso9000Certified bool `asn1:"optional,default=false"`
Iso9000URI string `asn1:"optional"` Iso9000URI string `asn1:"optional"`
} }
@ -350,7 +350,7 @@ type CommonCriteriaMeasures_sda struct {
Version string Version string
AssuranceLevel asn1.Enumerated AssuranceLevel asn1.Enumerated
EvaluationStatus asn1.Enumerated EvaluationStatus asn1.Enumerated
Plus bool Plus bool `asn1:"optional,default=false"`
StrengthOfFunction asn1.Enumerated `asn1:"optional"` StrengthOfFunction asn1.Enumerated `asn1:"optional"`
ProfileOid asn1.ObjectIdentifier `asn1:"optional"` ProfileOid asn1.ObjectIdentifier `asn1:"optional"`
ProfileURI string `asn1:"optional"` ProfileURI string `asn1:"optional"`