From 24fca356e97d9d544a7ed8a610cbe67eca9cfb9c Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo@golang.org>
Date: Fri, 7 Jun 2019 13:48:42 -0400
Subject: [PATCH] [dev.boringcrypto] crypto: move crypto/internal/boring
 imports to reduce merge conflicts

As suggested by dmitshur@, move them to their own block so they don't
conflict with changes in the upstream imports.

Change-Id: Id46fb7c766066c406023b0355f4c3c860166f0fe
Reviewed-on: https://go-review.googlesource.com/c/go/+/181277
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
---
 cipher_suites.go | 3 ++-
 common.go        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cipher_suites.go b/cipher_suites.go
index 19b75f9..1febee4 100644
--- a/cipher_suites.go
+++ b/cipher_suites.go
@@ -10,7 +10,6 @@ import (
 	"crypto/cipher"
 	"crypto/des"
 	"crypto/hmac"
-	"crypto/internal/boring"
 	"crypto/rc4"
 	"crypto/sha1"
 	"crypto/sha256"
@@ -19,6 +18,8 @@ import (
 	"hash"
 )
 
+import "crypto/internal/boring"
+
 // a keyAgreement implements the client and server side of a TLS key agreement
 // protocol by generating and processing key exchange messages.
 type keyAgreement interface {
diff --git a/common.go b/common.go
index 9d501ec..3966763 100644
--- a/common.go
+++ b/common.go
@@ -7,7 +7,6 @@ package tls
 import (
 	"container/list"
 	"crypto"
-	"crypto/internal/boring"
 	"crypto/rand"
 	"crypto/sha512"
 	"crypto/x509"
@@ -23,6 +22,8 @@ import (
 	"time"
 )
 
+import "crypto/internal/boring"
+
 const (
 	VersionSSL30 = 0x0300
 	VersionTLS10 = 0x0301