qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 18:10:04 -07:00
Code Releases Activity

Revert "encoding/asn1: fix unmarshalling SEQUENCE OF SET"

Browse Source 
This reverts CL 160819 (commit 4692343cf4)

Reason for revert: causing lots of failures on master

Change-Id: I96fd39ae80fe350ba8b3aa310443d41daec38093
Reviewed-on: https://go-review.googlesource.com/c/go/+/206146
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Than McIntosh 2019-11-08 18:53:35 +00:00 committed by Brad Fitzpatrick
parent cb47edc0c4
commit b2b0992b05
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/encoding/asn1/asn1_test.go
View File

@ -1129,22 +1129,3 @@ func TestBMPString(t *testing.T) {
} }
} }
} }
func TestSequenceOfSet(t *testing.T) {
type someSetSET struct {
A int `asn1:"tag:0"`
}
type someStruct struct {
B int `asn1:"tag:0"`
C []someSetSET `asn1:"tag:1"`
}
der := []byte{0x30, 0x0F, 0x80, 0x01, 0x01, 0xA1, 0x0A, 0x31, 0x03, 0x80, 0x01, 0x01, 0x31, 0x03, 0x80, 0x01, 0x02}
var b someStruct
if _, err := Unmarshal(der, &b); err != nil {
t.Errorf("Unmarshal failed: %v", err)
}
}

3
src/encoding/asn1/common.go
View File

@ -167,9 +167,6 @@ func getUniversalType(t reflect.Type) (matchAny bool, tagNumber int, isCompound,
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
return false, TagInteger, false, true return false, TagInteger, false, true
case reflect.Struct: case reflect.Struct:
if strings.HasSuffix(t.Name(), "SET") {
return false, TagSet, true, true
}
return false, TagSequence, true, true return false, TagSequence, true, true
case reflect.Slice: case reflect.Slice:
if t.Elem().Kind() == reflect.Uint8 { if t.Elem().Kind() == reflect.Uint8 {