code review 22460043: encoding/asn1: Fix parsing of non-printable strings in

encoding/asn1: Fix parsing of non-printable strings in
sequences.

Use the same criteria for when to modify the tag type when
parsing a string in a sequence as when parsing a bare string
field.

Fixes issue 6726.

[jborg, 2013-11-06 20:12:21]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2013-11-06 20:20:44]

We're in a code freeze right now.  Please ping this thread again after Go
1.2 is released in early December.



On Wed, Nov 6, 2013 at 3:12 PM, <jakob@nym.se> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> encoding/asn1: Fix parsing of non-printable strings in
> sequences.
>
> Use the same criteria for when to modify the tag type when
> parsing a string in a sequence as when parsing a bare string
> field.
>
> Fixes issue 6726.
>
> Please review this at https://codereview.appspot.com/22460043/
>
> Affected files (+32, -3 lines):
>   M src/pkg/encoding/asn1/asn1.go
>   M src/pkg/encoding/asn1/asn1_test.go
>
>
> Index: src/pkg/encoding/asn1/asn1.go
> ===================================================================
> --- a/src/pkg/encoding/asn1/asn1.go
> +++ b/src/pkg/encoding/asn1/asn1.go
> @@ -451,11 +451,13 @@
>                 if err != nil {
>                         return
>                 }
> -               // We pretend that GENERAL STRINGs are PRINTABLE STRINGs so
> -               // that a sequence of them can be parsed into a []string.
> -               if t.tag == tagGeneralString {
> +               // We pretend that various other string types are
> PRINTABLE STRINGs
> +               // so that a sequence of them can be parsed into a
> []string.
> +               switch t.tag {
> +               case tagIA5String, tagGeneralString, tagT61String,
> tagUTF8String:
>                         t.tag = tagPrintableString
>                 }
> +
>                 if t.class != classUniversal || t.isCompound !=
> compoundType || t.tag != expectedTag {
>                         err = StructuralError{"sequence tag mismatch"}
>                         return
> Index: src/pkg/encoding/asn1/asn1_test.go
> ===================================================================
> --- a/src/pkg/encoding/asn1/asn1_test.go
> +++ b/src/pkg/encoding/asn1/asn1_test.go
> @@ -6,6 +6,7 @@
>
>  import (
>         "bytes"
> +       "fmt"
>         "math/big"
>         "reflect"
>         "testing"
> @@ -737,3 +738,29 @@
>         0xc8, 0x64, 0x8c, 0xb5, 0x50, 0x23, 0x82, 0x6f, 0xdb, 0xb8, 0x22,
> 0x1c, 0x43,
>         0x96, 0x07, 0xa8, 0xbb,
>  }
> +
> +var stringSliceTestData = [][]string{
> +       {"foo", "bar"},
> +       {"foo", "\\bar"},
> +       {"foo", "\"bar\""},
> +       {"foo", "åäö"},
> +}
> +
> +func TestUnmarshalStringSlice(t *testing.T) {
> +       for _, test := range stringSliceTestData {
> +               bs, err := Marshal(test)
> +               if err != nil {
> +                       t.Error(err)
> +               }
> +
> +               var res []string
> +               _, err = Unmarshal(bs, &res)
> +               if err != nil {
> +                       t.Error(err)
> +               }
> +
> +               if fmt.Sprintf("%v", res) != fmt.Sprintf("%v", test) {
> +                       t.Errorf("incorrect marshal/unmarshal; %v != %v",
> res, test)
> +               }
> +       }
> +}
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-dev+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>

[gobot, 2013-12-18 20:20:11]

R=agl@golang.org (assigned by rsc@google.com)

[agl1, 2013-12-18 22:06:32]

*** Submitted as https://code.google.com/p/go/source/detail?r=a55b71fd16a5 ***

encoding/asn1: Fix parsing of non-printable strings in
sequences.

Use the same criteria for when to modify the tag type when
parsing a string in a sequence as when parsing a bare string
field.

Fixes issue 6726.

R=golang-dev, bradfitz, gobot, agl
CC=golang-dev
https://codereview.appspot.com/22460043

Committer: Adam Langley <agl@golang.org>