[dev.boringcrypto] crypto/hmac: merge up to 2a206c7 and skip test

TestNonUniqueHash will not work on boringcrypto because
the hash.Hash that sha256 provides is noncomparable.

Change-Id: Ie3dc2d5d775953c381674e22272cb3433daa1b31

diff --cc src/cmd/compile/internal/gc/reflect.go
Simple merge

diff --cc src/cmd/go/go_test.go
Simple merge

diff --cc src/cmd/go/internal/load/pkg.go
Simple merge

diff --cc src/cmd/link/internal/ld/lib.go
Simple merge

diff --cc src/crypto/hmac/hmac.go
Simple merge

diff --cc src/crypto/hmac/hmac_test.go
index 7be8b1bbcfc0879471a4953123c0c81c850a5b70,25e67d7fe5325f72f90a60df452cd6e7d5e25fbe..55415abf020799c4120705d061aac7d6b7e4f3b7
--- 1/src/crypto/hmac/hmac_test.go
--- 2/src/crypto/hmac/hmac_test.go
+++ b/src/crypto/hmac/hmac_test.go
@@@ -5,7 -5,6 +5,8 @@@
  package hmac
  
  import (
 +      "bytes"
++      "crypto/internal/boring"
        "crypto/md5"
        "crypto/sha1"
        "crypto/sha256"
@@@ -582,6 -556,17 +583,20 @@@ func TestHMAC(t *testing.T) 
        }
  }
  
+ func TestNonUniqueHash(t *testing.T) {
++      if boring.Enabled {
++              t.Skip("hash.Hash provided by boringcrypto are not comparable")
++      }
+       sha := sha256.New()
+       defer func() {
+               err := recover()
+               if err == nil {
+                       t.Error("expected panic when calling New with a non-unique hash generation function")
+               }
+       }()
+       New(func() hash.Hash { return sha }, []byte("bytes"))
+ }
+ 
  // justHash implements just the hash.Hash methods and nothing else
  type justHash struct {
        hash.Hash

diff --cc src/crypto/tls/common.go
Simple merge

diff --cc src/go/build/build.go
Simple merge

diff --cc src/go/build/deps_test.go
Simple merge