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

Tweak some slightly fragile tests.

Browse Source 
These tests failed when CECPQ2 was enabled by default. Even if we're
not going to make CECPQ2 the default, it's worth fixing them to be more
robust.

Change-Id: Idef508bca9e17a4ef0e0a8a396755abd975f9908
Reviewed-on: https://boringssl-review.googlesource.com/c/34524
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Adam Langley 2019-01-23 14:05:40 -08:00 committed by CQ bot account: commit-bot@chromium.org
parent 4bfab5d9d7
commit 9801a07145
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12419,6 +12419,7 @@ func addTLS13HandshakeTests() {
MaxVersion: VersionTLS13, MaxVersion: VersionTLS13,
// Require a HelloRetryRequest for every curve. // Require a HelloRetryRequest for every curve.
DefaultCurves: []CurveID{}, DefaultCurves: []CurveID{},
CurvePreferences: []CurveID{CurveX25519},
}, },
expectedCurveID: CurveX25519, expectedCurveID: CurveX25519,
}) })
@ -12429,6 +12430,7 @@ func addTLS13HandshakeTests() {
config: Config{ config: Config{
MaxVersion: VersionTLS13, MaxVersion: VersionTLS13,
DefaultCurves: []CurveID{CurveP384}, DefaultCurves: []CurveID{CurveP384},
CurvePreferences: []CurveID{CurveX25519, CurveP384},
}, },
// Although the ClientHello did not predict our preferred curve, // Although the ClientHello did not predict our preferred curve,
// we always select it whether it is predicted or not. // we always select it whether it is predicted or not.
@ -13560,6 +13562,7 @@ func addTLS13CipherPreferenceTests() {
TLS_CHACHA20_POLY1305_SHA256, TLS_CHACHA20_POLY1305_SHA256,
TLS_AES_128_GCM_SHA256, TLS_AES_128_GCM_SHA256,
}, },
CurvePreferences: []CurveID{CurveX25519},
}, },
flags: []string{ flags: []string{
"-expect-cipher-aes", strconv.Itoa(int(TLS_CHACHA20_POLY1305_SHA256)), "-expect-cipher-aes", strconv.Itoa(int(TLS_CHACHA20_POLY1305_SHA256)),
@ -13576,6 +13579,7 @@ func addTLS13CipherPreferenceTests() {
TLS_AES_128_GCM_SHA256, TLS_AES_128_GCM_SHA256,
TLS_CHACHA20_POLY1305_SHA256, TLS_CHACHA20_POLY1305_SHA256,
}, },
CurvePreferences: []CurveID{CurveX25519},
}, },
flags: []string{ flags: []string{
"-expect-cipher-aes", strconv.Itoa(int(TLS_AES_128_GCM_SHA256)), "-expect-cipher-aes", strconv.Itoa(int(TLS_AES_128_GCM_SHA256)),