[dev.boringcrypto] crypto/internal/cipherhw: fix AESGCMSupport for BoringCrypto

The override was not commented and was in the wrong file.

Change-Id: I739db561acff6d91b0f3559c8bb45437f11c0b04
Reviewed-on: https://go-review.googlesource.com/59250
Reviewed-by: Adam Langley <agl@golang.org>

diff --git a/src/crypto/internal/cipherhw/cipherhw_amd64.go b/src/crypto/internal/cipherhw/cipherhw_amd64.go
index be0d490a221786f1bef3c0c6ed19787300b44203..a1267b17a291f6cff1d23dbd4593ab1010c47b3c 100644 (file)
--- a/src/crypto/internal/cipherhw/cipherhw_amd64.go
+++ b/src/crypto/internal/cipherhw/cipherhw_amd64.go
@@ -6,11 +6,19 @@
 
 package cipherhw
 
+import "crypto/internal/boring"
+
 // defined in asm_amd64.s
 func hasAESNI() bool
 
 // AESGCMSupport returns true if the Go standard library supports AES-GCM in
 // hardware.
 func AESGCMSupport() bool {
+       // If BoringCrypto is enabled, we report having
+       // AES-GCM support, so that crypto/tls will
+       // prioritize AES-GCM usage.
+       if boring.Enabled {
+               return true
+       }
        return hasAESNI()
 }

diff --git a/src/crypto/internal/cipherhw/generic.go b/src/crypto/internal/cipherhw/generic.go
index 4e7d2cb04117d1f6f89dd6b763819276b0827d28..64d90d3b41eaa31753694f290596d30bcb8b28ac 100644 (file)
--- a/src/crypto/internal/cipherhw/generic.go
+++ b/src/crypto/internal/cipherhw/generic.go
@@ -6,8 +6,6 @@
 
 package cipherhw
 
-import "crypto/internal/boring"
-
 func AESGCMSupport() bool {
-       return boring.Enabled
+       return false
 }