diff options
| author | Michael Munday <munday@ca.ibm.com> | 2016-11-07 15:40:48 -0500 |
|---|---|---|
| committer | Michael Munday <munday@ca.ibm.com> | 2016-11-07 21:18:21 +0000 |
| commit | 47d1c42aff6bb84a654cc69b1dbc42f855b03415 (patch) | |
| tree | 8179360e4e1e96f3cadcde803f255f378df82dea | |
| parent | 1a279b34f674369c05694bd2d8e493ec2d3bba97 (diff) | |
| download | go-47d1c42aff6bb84a654cc69b1dbc42f855b03415.tar.gz go-47d1c42aff6bb84a654cc69b1dbc42f855b03415.zip | |
crypto/tls: use default cipher suites in BenchmarkThroughput
CL 32871 updated the default cipher suites to use AES-GCM in
preference to ChaCha20-Poly1305 on platforms which have hardware
implementations of AES-GCM. This change makes BenchmarkThroughput
use the default cipher suites instead of the test cipher suites to
ensure that the recommended (fastest) algorithms are used.
Updates #17779.
Change-Id: Ib551223e4a00b5ea197d4d73748e1fdd8a47c32d
Reviewed-on: https://go-review.googlesource.com/32838
Run-TryBot: Michael Munday <munday@ca.ibm.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Adam Langley <agl@golang.org>
| -rw-r--r-- | src/crypto/tls/tls_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go index 83b1f4ca9d..1a5286c383 100644 --- a/src/crypto/tls/tls_test.go +++ b/src/crypto/tls/tls_test.go @@ -668,6 +668,7 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool panic(fmt.Errorf("accept: %v", err)) } serverConfig := testConfig.Clone() + serverConfig.CipherSuites = nil // the defaults may prefer faster ciphers serverConfig.DynamicRecordSizingDisabled = dynamicRecordSizingDisabled srv := Server(sconn, serverConfig) if err := srv.Handshake(); err != nil { @@ -681,6 +682,7 @@ func throughput(b *testing.B, totalBytes int64, dynamicRecordSizingDisabled bool b.SetBytes(totalBytes) clientConfig := testConfig.Clone() + clientConfig.CipherSuites = nil // the defaults may prefer faster ciphers clientConfig.DynamicRecordSizingDisabled = dynamicRecordSizingDisabled buf := make([]byte, bufsize) |