mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 12:37:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

[dev.boringcrypto] crypto: move crypto/internal/boring imports to reduce merge conflicts

Browse source 
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>
This commit is contained in:
Filippo Valsorda 2019-06-07 13:48:42 -04:00
parent d20db7973d
commit 24fca356e9
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cipher_suites.go
View file

@ -10,7 +10,6 @@ import (
"crypto/cipher" "crypto/cipher"
"crypto/des" "crypto/des"
"crypto/hmac" "crypto/hmac"
"crypto/internal/boring"
"crypto/rc4" "crypto/rc4"
"crypto/sha1" "crypto/sha1"
"crypto/sha256" "crypto/sha256"
@ -19,6 +18,8 @@ import (
"hash" "hash"
) )
import "crypto/internal/boring"
// a keyAgreement implements the client and server side of a TLS key agreement // a keyAgreement implements the client and server side of a TLS key agreement
// protocol by generating and processing key exchange messages. // protocol by generating and processing key exchange messages.
type keyAgreement interface { type keyAgreement interface {

3
common.go
View file

@ -7,7 +7,6 @@ package tls
import ( import (
"container/list" "container/list"
"crypto" "crypto"
"crypto/internal/boring"
"crypto/rand" "crypto/rand"
"crypto/sha512" "crypto/sha512"
"crypto/x509" "crypto/x509"
@ -23,6 +22,8 @@ import (
"time" "time"
) )
import "crypto/internal/boring"
const ( const (
VersionSSL30 = 0x0300 VersionSSL30 = 0x0300
VersionTLS10 = 0x0301 VersionTLS10 = 0x0301