From afb1b0a8498acfa6f186474ac695ce9f04ab91e0 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 4 May 2022 08:58:02 -0400
Subject: [PATCH] all: boringcrypto post-merge cleanup

This CL addresses the comments on CL 403154.

For #51940.

Change-Id: I99bb3530916d469077bfbd53095bfcd1d2aa82ef
Reviewed-on: https://go-review.googlesource.com/c/go/+/403976
Reviewed-by: Roland Shoemaker <roland@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
---
 cipher_suites.go | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cipher_suites.go b/cipher_suites.go
index 3004b31..9a1fa31 100644
--- a/cipher_suites.go
+++ b/cipher_suites.go
@@ -4,14 +4,13 @@
 
 package tls
 
-import "crypto/internal/boring"
-
 import (
 	"crypto"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/des"
 	"crypto/hmac"
+	"crypto/internal/boring"
 	"crypto/rc4"
 	"crypto/sha1"
 	"crypto/sha256"
@@ -517,12 +516,9 @@ func aeadAESGCM(key, noncePrefix []byte) aead {
 	if err != nil {
 		panic(err)
 	}
-	type gcmtls interface {
-		NewGCMTLS() (cipher.AEAD, error)
-	}
 	var aead cipher.AEAD
-	if aesTLS, ok := aes.(gcmtls); ok {
-		aead, err = aesTLS.NewGCMTLS()
+	if boring.Enabled {
+		aead, err = boring.NewGCMTLS(aes)
 	} else {
 		boring.Unreachable()
 		aead, err = cipher.NewGCM(aes)