diff options
| author | Adam Langley <agl@google.com> | 2015-06-15 13:52:15 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-06-15 15:50:04 -0700 |
| commit | dfb3ba68fd0011cba7d8e4c1a46295099fef85bf (patch) | |
| tree | 179de31d373d518d1e129eca1d63a2974c999fe7 /src/ssl/test/runner/runner.go | |
| parent | 4bae3aba0494da7c4e3c1b28ff978eb38e6323e6 (diff) | |
| download | external_boringssl-dfb3ba68fd0011cba7d8e4c1a46295099fef85bf.zip external_boringssl-dfb3ba68fd0011cba7d8e4c1a46295099fef85bf.tar.gz external_boringssl-dfb3ba68fd0011cba7d8e4c1a46295099fef85bf.tar.bz2 | |
Add ECDHE-PSK-AES{128,256}-SHA cipher suites.
If we're going to have PSK and use standard cipher suites, this might be
the best that we can do for the moment.
(This is a cherry-pick of BoringSSL's 85bc5601.)
(cherry picked from commit 0e6bb1c72014c26289d09f4deea9c25706be5824)
Bug: 21522548
Change-Id: Ic94c74a2b3ee2387f640efff510646d1836efbfb
Diffstat (limited to 'src/ssl/test/runner/runner.go')
| -rw-r--r-- | src/ssl/test/runner/runner.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ssl/test/runner/runner.go b/src/ssl/test/runner/runner.go index f60d8ba..94c1d32 100644 --- a/src/ssl/test/runner/runner.go +++ b/src/ssl/test/runner/runner.go @@ -1625,6 +1625,8 @@ var testCipherSuites = []struct { {"ECDHE-RSA-RC4-SHA", TLS_ECDHE_RSA_WITH_RC4_128_SHA}, {"PSK-AES128-CBC-SHA", TLS_PSK_WITH_AES_128_CBC_SHA}, {"PSK-AES256-CBC-SHA", TLS_PSK_WITH_AES_256_CBC_SHA}, + {"ECDHE-PSK-AES128-CBC-SHA", TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA}, + {"ECDHE-PSK-AES256-CBC-SHA", TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA}, {"PSK-RC4-SHA", TLS_PSK_WITH_RC4_128_SHA}, {"RC4-MD5", TLS_RSA_WITH_RC4_128_MD5}, {"RC4-SHA", TLS_RSA_WITH_RC4_128_SHA}, |