diff options
Diffstat (limited to 'src/pkg/asn1/marshal.go')
| -rw-r--r-- | src/pkg/asn1/marshal.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pkg/asn1/marshal.go b/src/pkg/asn1/marshal.go index 771ac2824..7212c91ef 100644 --- a/src/pkg/asn1/marshal.go +++ b/src/pkg/asn1/marshal.go @@ -458,11 +458,12 @@ func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters) return marshalField(out, v.Elem(), params) } + if params.optional && reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface()) { + return + } + if v.Type() == rawValueType { rv := v.Interface().(RawValue) - if rv.Class == 0 && rv.Tag == 0 && len(rv.Bytes) == 0 && params.optional { - return - } err = marshalTagAndLength(out, tagAndLength{rv.Class, rv.Tag, len(rv.Bytes), rv.IsCompound}) if err != nil { return @@ -471,10 +472,6 @@ func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters) return } - if params.optional && reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface()) { - return - } - tag, isCompound, ok := getUniversalType(v.Type()) if !ok { err = StructuralError{fmt.Sprintf("unknown Go type: %v", v.Type())} |