goc_marek/go_S-MIME
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Added README; additional tests and fixes for them.

Browse Source
This commit is contained in:
InfiniteLoopSpace
2018-11-20 15:03:05 +01:00
parent 830a60b19f
commit 58514b0041
4 changed files with 303 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
asn1/asn1.go
View File

@ -535,7 +535,7 @@ func parseTagAndLength(bytes []byte, initOffset int) (ret tagAndLength, offset i
// Bottom 7 bits give the number of length bytes to follow.
numBytes := int(b & 0x7f)
if numBytes == 0 {
if ret.isCompound {
if ret.isCompound && ret.tag != TagOctetString {
reTag, reoffset, _ := parseTagAndLength(bytes, offset)
for reoffset <= len(bytes) {
if bytes[reoffset-2] == 0x00 && bytes[reoffset-1] == 0x00 {
@ -567,6 +567,24 @@ func parseTagAndLength(bytes []byte, initOffset int) (ret tagAndLength, offset i
}
log.Println("indefinite length found (not DER)")
}
if ret.isCompound && ret.tag == TagOctetString {
reTag, reoffset, _ := parseTagAndLength(bytes, offset)
for reoffset <= len(bytes) {
if bytes[reoffset-2] == 0x00 && bytes[reoffset-1] == 0x00 {
//delete indefinite termination
ret.length = reoffset - offset
return
}
if len(bytes) <= reoffset+reTag.length {
err = asn1.StructuralError{"indefinete lenght: length too large"}
return
}
reTag, reoffset, _ = parseTagAndLength(bytes, reoffset+reTag.length)
}
log.Println("indefinite length found (not DER)")
}
err = asn1.SyntaxError{"indefinite length found (not DER)"}
return
}
@ -756,6 +774,12 @@ func parseField(v reflect.Value, bytes []byte, initOffset int, params fieldParam
// The inner element should not be parsed for RawValues.
} else if t.length > 0 {
t, offset, err = parseTagAndLength(bytes, offset)
if t.isCompound && t.tag == TagOctetString {
t, offset, err = parseTagAndLength(bytes, offset)
if t.tag == TagOctetString {
v.Set(reflect.ValueOf(bytes[offset : offset+t.length]))
}
}
if err != nil {
return
}