diff options
| author | Adam Langley <agl@google.com> | 2015-06-15 13:51:03 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-06-15 15:49:51 -0700 |
| commit | 4bae3aba0494da7c4e3c1b28ff978eb38e6323e6 (patch) | |
| tree | ecf049c0e56fdf2b7d414b2fcafa8b190b65e2cd /src/ssl/test/runner/runner.go | |
| parent | dbfa1800f3b4f00609142853f43897e760eb33c2 (diff) | |
| download | external_boringssl-4bae3aba0494da7c4e3c1b28ff978eb38e6323e6.zip external_boringssl-4bae3aba0494da7c4e3c1b28ff978eb38e6323e6.tar.gz external_boringssl-4bae3aba0494da7c4e3c1b28ff978eb38e6323e6.tar.bz2 | |
Drop ECDHE-PSK-AES-128-GCM.
This is the best PSK cipher suite, but it's non-standard and nobody is
using it. Trivial to bring back in the future if we have need of it.
(Note that this is a no-op in Android because Android had already
disabled this cipher suite.)
(This is a cherry-pick of BoringSSL's 1feb42a2.)
(cherry picked from commit a4be71cee108bfed76ddb37552b7e48945d91b49)
Bug: 21522548
Change-Id: I2a051724500341053595f59e755349544da63ce5
Diffstat (limited to 'src/ssl/test/runner/runner.go')
| -rw-r--r-- | src/ssl/test/runner/runner.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ssl/test/runner/runner.go b/src/ssl/test/runner/runner.go index bd03cb1..f60d8ba 100644 --- a/src/ssl/test/runner/runner.go +++ b/src/ssl/test/runner/runner.go @@ -1615,7 +1615,6 @@ var testCipherSuites = []struct { {"ECDHE-ECDSA-AES256-SHA384", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384}, {"ECDHE-ECDSA-CHACHA20-POLY1305", TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256}, {"ECDHE-ECDSA-RC4-SHA", TLS_ECDHE_ECDSA_WITH_RC4_128_SHA}, - {"ECDHE-PSK-AES128-GCM-SHA256", TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256}, {"ECDHE-RSA-AES128-GCM", TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256}, {"ECDHE-RSA-AES128-SHA", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA}, {"ECDHE-RSA-AES128-SHA256", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256}, |