From: Filippo Valsorda <filippo@golang.org>
Date: Wed, 5 Jun 2019 10:23:38 +0000 (-0400)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~114
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=324f8365be;p=gostls13.git

[dev.boringcrypto] all: merge master into dev.boringcrypto

Change-Id: I29cf70cab6b4c28891dce2a3ccf18b690ff568a0
---

324f8365be3aa144879e6b1abb4e13c51b5f4750
diff --cc src/crypto/sha256/sha256.go
index 8e4915a7d8,e1cccf65a6..faf29f25ad
--- a/src/crypto/sha256/sha256.go
+++ b/src/crypto/sha256/sha256.go
@@@ -8,7 -8,7 +8,8 @@@ package sha25
  
  import (
  	"crypto"
 +	"crypto/internal/boring"
+ 	"encoding/binary"
  	"errors"
  	"hash"
  )
diff --cc src/crypto/sha512/sha512.go
index 394e001eee,9c143a2a28..3fefd65c65
--- a/src/crypto/sha512/sha512.go
+++ b/src/crypto/sha512/sha512.go
@@@ -12,7 -12,7 +12,8 @@@ package sha51
  
  import (
  	"crypto"
 +	"crypto/internal/boring"
+ 	"encoding/binary"
  	"errors"
  	"hash"
  )