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

Fix more hard-coded TLS 1.3 variant strings.

Browse Source 
These should use the shim/runner combined setting.

Change-Id: Iad6abb4e76f6e5accef446696aa4132073eca06a
Reviewed-on: https://boringssl-review.googlesource.com/18984
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
This commit is contained in:
David Benjamin 2017-08-08 20:04:41 -04:00
parent 016ebe2d0e
commit f6ae9e6c2c
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4229,21 +4229,20 @@ func addStateMachineCoverageTests(config stateMachineTestConfig) {
testType: serverTest, testType: serverTest,
name: "TLS13Experiment-EarlyData-Server", name: "TLS13Experiment-EarlyData-Server",
config: Config{ config: Config{
MaxVersion: VersionTLS13, MaxVersion: VersionTLS13,
MinVersion: VersionTLS13, MinVersion: VersionTLS13,
TLS13Variant: TLS13Experiment,
Bugs: ProtocolBugs{ Bugs: ProtocolBugs{
SendEarlyData: [][]byte{{1, 2, 3, 4}}, SendEarlyData: [][]byte{{1, 2, 3, 4}},
ExpectEarlyDataAccepted: true, ExpectEarlyDataAccepted: true,
ExpectHalfRTTData: [][]byte{{254, 253, 252, 251}}, ExpectHalfRTTData: [][]byte{{254, 253, 252, 251}},
}, },
}, },
tls13Variant: TLS13Experiment,
messageCount: 2, messageCount: 2,
resumeSession: true, resumeSession: true,
flags: []string{ flags: []string{
"-enable-early-data", "-enable-early-data",
"-expect-accept-early-data", "-expect-accept-early-data",
"-tls13-variant", "1",
}, },
}) })
@ -4251,21 +4250,20 @@ func addStateMachineCoverageTests(config stateMachineTestConfig) {
testType: serverTest, testType: serverTest,
name: "TLS13RecordTypeExperiment-EarlyData-Server", name: "TLS13RecordTypeExperiment-EarlyData-Server",
config: Config{ config: Config{
MaxVersion: VersionTLS13, MaxVersion: VersionTLS13,
MinVersion: VersionTLS13, MinVersion: VersionTLS13,
TLS13Variant: TLS13RecordTypeExperiment,
Bugs: ProtocolBugs{ Bugs: ProtocolBugs{
SendEarlyData: [][]byte{{1, 2, 3, 4}}, SendEarlyData: [][]byte{{1, 2, 3, 4}},
ExpectEarlyDataAccepted: true, ExpectEarlyDataAccepted: true,
ExpectHalfRTTData: [][]byte{{254, 253, 252, 251}}, ExpectHalfRTTData: [][]byte{{254, 253, 252, 251}},
}, },
}, },
tls13Variant: TLS13RecordTypeExperiment,
messageCount: 2, messageCount: 2,
resumeSession: true, resumeSession: true,
flags: []string{ flags: []string{
"-enable-early-data", "-enable-early-data",
"-expect-accept-early-data", "-expect-accept-early-data",
"-tls13-variant", "2",
}, },
}) })
@ -10637,26 +10635,24 @@ func addTLS13HandshakeTests() {
testType: serverTest, testType: serverTest,
name: "SkipEarlyData-TLS13Experiment", name: "SkipEarlyData-TLS13Experiment",
config: Config{ config: Config{
MaxVersion: VersionTLS13, MaxVersion: VersionTLS13,
TLS13Variant: TLS13Experiment,
Bugs: ProtocolBugs{ Bugs: ProtocolBugs{
SendFakeEarlyDataLength: 4, SendFakeEarlyDataLength: 4,
}, },
}, },
flags: []string{"-tls13-variant", "1"}, tls13Variant: TLS13Experiment,
}) })
testCases = append(testCases, testCase{ testCases = append(testCases, testCase{
testType: serverTest, testType: serverTest,
name: "SkipEarlyData-TLS13RecordTypeExperiment", name: "SkipEarlyData-TLS13RecordTypeExperiment",
config: Config{ config: Config{
MaxVersion: VersionTLS13, MaxVersion: VersionTLS13,
TLS13Variant: TLS13RecordTypeExperiment,
Bugs: ProtocolBugs{ Bugs: ProtocolBugs{
SendFakeEarlyDataLength: 4, SendFakeEarlyDataLength: 4,
}, },
}, },
flags: []string{"-tls13-variant", "2"}, tls13Variant: TLS13RecordTypeExperiment,
}) })
testCases = append(testCases, testCase{ testCases = append(testCases, testCase{