kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove remnants of non-standard ECDHE_PSK GCM ciphers.

Browse Source 
Change-Id: I471880d785c38123e038279f67348bf02b47d091
Reviewed-on: https://boringssl-review.googlesource.com/13662
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-02-07 15:51:32 -05:00 committed by CQ bot account: commit-bot@chromium.org
parent 6b0edfb9e6
commit 3bd57e3a6f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/test/runner/runner.go
View File

@ -2514,11 +2514,6 @@ func addTestForCipherSuite(suite testCipherSuite, ver tlsVersion, protocol proto
// NULL ciphers must be explicitly enabled. // NULL ciphers must be explicitly enabled.
flags = append(flags, "-cipher", "DEFAULT:NULL-SHA") flags = append(flags, "-cipher", "DEFAULT:NULL-SHA")
} }
if hasComponent(suite.name, "ECDHE-PSK") && hasComponent(suite.name, "GCM") {
// ECDHE_PSK AES_GCM ciphers must be explicitly enabled
// for now.
flags = append(flags, "-cipher", suite.name)
}
var shouldServerFail, shouldClientFail bool var shouldServerFail, shouldClientFail bool
if hasComponent(suite.name, "ECDHE") && ver.version == VersionSSL30 { if hasComponent(suite.name, "ECDHE") && ver.version == VersionSSL30 {