]> Cypherpunks.ru repositories - gostls13.git/commitdiff
[dev.boringcrypto] all: merge commit 57c115e1 into dev.boringcrypto
authorRoland Shoemaker <roland@golang.org>
Mon, 16 Aug 2021 16:14:21 +0000 (09:14 -0700)
committerRoland Shoemaker <roland@golang.org>
Mon, 16 Aug 2021 17:33:17 +0000 (10:33 -0700)
Change-Id: I9e2b83c8356372034e4e3bfc6539b813e73611c9

13 files changed:
1  2 
src/cmd/compile/internal/reflectdata/reflect.go
src/cmd/go/go_test.go
src/cmd/go/internal/load/pkg.go
src/cmd/link/internal/ld/lib.go
src/crypto/sha256/sha256.go
src/crypto/sha512/sha512.go
src/crypto/tls/common.go
src/crypto/tls/handshake_client.go
src/crypto/tls/handshake_client_tls13.go
src/crypto/tls/handshake_server.go
src/crypto/tls/handshake_server_tls13.go
src/go/build/build.go
src/go/build/deps_test.go

Simple merge
Simple merge
Simple merge
index 8b54a427d7d4c8c25cd650fe2703a8cbae0c4306,659531dc716f7f7109edd9c851b2a19d0aef477c..465d00e0e68315c8a114f37d92fdf4f55af3baa3
@@@ -276,14 -259,7 +276,14 @@@ func Sum256(data []byte) [Size]byte 
  }
  
  // Sum224 returns the SHA224 checksum of the data.
- func Sum224(data []byte) (sum224 [Size224]byte) {
+ func Sum224(data []byte) [Size224]byte {
 +      if boring.Enabled {
 +              h := New224()
 +              h.Write(data)
 +              var ret [Size224]byte
 +              h.Sum(ret[:0])
 +              return ret
 +      }
        var d digest
        d.is224 = true
        d.Reset()
index 1a2cef317c34023325ac805c2365606f1e551fb6,d5715558c0484b40706d37e6957849e1874dc1b7..1285cca7ee6efb03eef7c1b7653baf005e7befc7
@@@ -358,14 -337,7 +358,14 @@@ func Sum512(data []byte) [Size]byte 
  }
  
  // Sum384 returns the SHA384 checksum of the data.
- func Sum384(data []byte) (sum384 [Size384]byte) {
+ func Sum384(data []byte) [Size384]byte {
 +      if boring.Enabled {
 +              h := New384()
 +              h.Write(data)
 +              var ret [Size384]byte
 +              h.Sum(ret[:0])
 +              return ret
 +      }
        d := digest{function: crypto.SHA384}
        d.Reset()
        d.Write(data)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge