From f7156f63b52af3242e8415a209ff6fea119f5903 Mon Sep 17 00:00:00 2001 From: Michael Teichgraeber Date: Fri, 20 Apr 2018 01:22:30 +0200 Subject: [PATCH] encoding/asn1: support fractions of a second when unmarshaling GeneralizedTime A GeneralizedTime value may contain an optional fractional seconds element (according to X.680 46.2, restricted by X.690 11.7.3). This change adds support for this fractional part, up to nine digits, so that Unmarshal won't fail when decoding a DER encoded GeneralizedTime value with fractional digits. Also, test cases related to this change have been added. X.680 and X.690 can be found at: https://www.itu.int/rec/T-REC-X.680 https://www.itu.int/rec/T-REC-X.690 Fixes #15842 Change-Id: If217c007e01b686db508a940e9e2ed3bfb901879 Reviewed-on: https://go-review.googlesource.com/c/go/+/108355 Run-TryBot: Dmitri Shuralyov Reviewed-by: Emmanuel Odeke Reviewed-by: Dmitri Shuralyov Auto-Submit: Ian Lance Taylor Reviewed-by: Alan Donovan TryBot-Result: Gopher Robot --- src/encoding/asn1/asn1.go | 2 +- src/encoding/asn1/asn1_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/encoding/asn1/asn1.go b/src/encoding/asn1/asn1.go index 2e320897e3..f743cd6f69 100644 --- a/src/encoding/asn1/asn1.go +++ b/src/encoding/asn1/asn1.go @@ -365,7 +365,7 @@ func parseUTCTime(bytes []byte) (ret time.Time, err error) { // parseGeneralizedTime parses the GeneralizedTime from the given byte slice // and returns the resulting time. func parseGeneralizedTime(bytes []byte) (ret time.Time, err error) { - const formatStr = "20060102150405Z0700" + const formatStr = "20060102150405.999999999Z0700" s := string(bytes) if ret, err = time.Parse(formatStr, s); err != nil { diff --git a/src/encoding/asn1/asn1_test.go b/src/encoding/asn1/asn1_test.go index 90bdfcddf9..0e67dbf396 100644 --- a/src/encoding/asn1/asn1_test.go +++ b/src/encoding/asn1/asn1_test.go @@ -323,6 +323,10 @@ func TestUTCTime(t *testing.T) { var generalizedTimeTestData = []timeTest{ {"20100102030405Z", true, time.Date(2010, 01, 02, 03, 04, 05, 0, time.UTC)}, {"20100102030405", false, time.Time{}}, + {"20100102030405.123456Z", true, time.Date(2010, 01, 02, 03, 04, 05, 123456e3, time.UTC)}, + {"20100102030405.123456", false, time.Time{}}, + {"20100102030405.Z", false, time.Time{}}, + {"20100102030405.", false, time.Time{}}, {"20100102030405+0607", true, time.Date(2010, 01, 02, 03, 04, 05, 0, time.FixedZone("", 6*60*60+7*60))}, {"20100102030405-0607", true, time.Date(2010, 01, 02, 03, 04, 05, 0, time.FixedZone("", -6*60*60-7*60))}, /* These are invalid times. However, the time package normalises times -- 2.48.1