From faadfbdc035307d901e69eea569f5dda451a3ee3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Tue, 12 Sep 2017 12:17:24 -0700 Subject: [PATCH] cryptobyte: include changes from review of 57810 I forgot to upload the final set of changes before submitting. Change-Id: I3e60c6e2aad25af7f5007fc5ffbf8a1a1e1a91f3 Reviewed-on: https://go-review.googlesource.com/63331 Reviewed-by: Adam Langley --- cryptobyte/asn1.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cryptobyte/asn1.go b/cryptobyte/asn1.go index 11803df..88ec8b4 100644 --- a/cryptobyte/asn1.go +++ b/cryptobyte/asn1.go @@ -562,9 +562,6 @@ func (s *String) ReadOptionalASN1(out *String, outPresent *bool, tag asn1.Tag) b if outPresent != nil { *outPresent = present } - if out != nil { - *out = String(nil) - } if present && !s.ReadASN1(out, tag) { return false } @@ -727,7 +724,7 @@ func (s *String) readASN1(out *String, outTag *asn1.Tag, skipHeader bool) bool { if uint32(int(length)) != length || !s.ReadBytes((*[]byte)(out), int(length)) { return false } - if skipHeader && out != nil && !out.Skip(int(headerLen)) { + if skipHeader && !out.Skip(int(headerLen)) { panic("cryptobyte: internal error") }