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

…ringCrypto 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 <[email protected]>
cloudflare · Aug 30, 2017 · 9c307d8 · 9c307d8
1 parent f48a9fb
commit 9c307d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -6,8 +6,6 @@
 
 package cipherhw
 
-import "crypto/internal/boring"
-
 func AESGCMSupport() bool {
- return boring.Enabled
+ return false
 }