From 68e30af111da6fdfa0c4f0b71b9fabe37bbfe2df Mon Sep 17 00:00:00 2001 From: Katie Hockman Date: Mon, 26 Oct 2020 13:39:56 +0000 Subject: [PATCH] Revert "crypto/x509: fix duplicate import" This reverts CL 250497. It also moves all blank identifier imports below the rest of the imports for clarity. Reason for revert: The blank identifier import was intentional to show that it's needed for its registration side effect. The duplicate import should stay since it communicates that the side-effect is important to tools and to future developers updating this file. Change-Id: I626e6329db50f47453aa71085a05d21bf6efe0ac Reviewed-on: https://go-review.googlesource.com/c/go/+/265078 Run-TryBot: Katie Hockman Trust: Emmanuel Odeke Trust: Brad Fitzpatrick TryBot-Result: Go Bot Reviewed-by: Brad Fitzpatrick --- src/crypto/x509/x509.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/crypto/x509/x509.go b/src/crypto/x509/x509.go index b421d75973..a314b5ed1a 100644 --- a/src/crypto/x509/x509.go +++ b/src/crypto/x509/x509.go @@ -14,8 +14,6 @@ import ( "crypto/elliptic" "crypto/rsa" "crypto/sha1" - _ "crypto/sha256" - _ "crypto/sha512" "crypto/x509/pkix" "encoding/asn1" "encoding/pem" @@ -30,6 +28,10 @@ import ( "time" "unicode" + _ "crypto/sha1" + _ "crypto/sha256" + _ "crypto/sha512" + "golang.org/x/crypto/cryptobyte" cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" ) -- 2.48.1