diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-03-26 16:50:58 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-03-26 16:50:58 +0200 |
| commit | 519725bb3c075ee2462c929f5997cb068e18466a (patch) | |
| tree | 5b162e8488ad147a645048c073577821b4a2bee9 /src/pkg/encoding/asn1/asn1.go | |
| parent | 842623c5dd2819d980ca9c58048d6bc6ed82475f (diff) | |
| download | golang-upstream-weekly/2012.03.22.tar.gz | |
Imported Upstream version 2012.03.22upstream-weekly/2012.03.22
Diffstat (limited to 'src/pkg/encoding/asn1/asn1.go')
| -rw-r--r-- | src/pkg/encoding/asn1/asn1.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pkg/encoding/asn1/asn1.go b/src/pkg/encoding/asn1/asn1.go index 4d1ae38c4..3bf81a68c 100644 --- a/src/pkg/encoding/asn1/asn1.go +++ b/src/pkg/encoding/asn1/asn1.go @@ -250,10 +250,14 @@ func parseBase128Int(bytes []byte, initOffset int) (ret, offset int, err error) func parseUTCTime(bytes []byte) (ret time.Time, err error) { s := string(bytes) ret, err = time.Parse("0601021504Z0700", s) - if err == nil { - return + if err != nil { + ret, err = time.Parse("060102150405Z0700", s) } - ret, err = time.Parse("060102150405Z0700", s) + if err == nil && ret.Year() >= 2050 { + // UTCTime only encodes times prior to 2050. See https://tools.ietf.org/html/rfc5280#section-4.1.2.5.1 + ret = ret.AddDate(-100, 0, 0) + } + return } |