summaryrefslogtreecommitdiffstats
path: root/src/ssl/test/runner/runner.go
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-06-15 13:52:15 -0700
committerKenny Root <kroot@google.com>2015-06-15 22:47:39 +0000
commit0e6bb1c72014c26289d09f4deea9c25706be5824 (patch)
tree628396a74d34d7b719b81d76410e7801111b6d40 /src/ssl/test/runner/runner.go
parenta4be71cee108bfed76ddb37552b7e48945d91b49 (diff)
downloadexternal_boringssl-0e6bb1c72014c26289d09f4deea9c25706be5824.zip
external_boringssl-0e6bb1c72014c26289d09f4deea9c25706be5824.tar.gz
external_boringssl-0e6bb1c72014c26289d09f4deea9c25706be5824.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.) Bug: 21522548 Change-Id: Ic94c74a2b3ee2387f640efff510646d1836efbfb
Diffstat (limited to 'src/ssl/test/runner/runner.go')
-rw-r--r--src/ssl/test/runner/runner.go2
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},