Fix more hard-coded TLS 1.3 variant strings.
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>
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index 9898101..4d7d2b0 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -4229,21 +4229,20 @@
testType: serverTest,
name: "TLS13Experiment-EarlyData-Server",
config: Config{
- MaxVersion: VersionTLS13,
- MinVersion: VersionTLS13,
- TLS13Variant: TLS13Experiment,
+ MaxVersion: VersionTLS13,
+ MinVersion: VersionTLS13,
Bugs: ProtocolBugs{
SendEarlyData: [][]byte{{1, 2, 3, 4}},
ExpectEarlyDataAccepted: true,
ExpectHalfRTTData: [][]byte{{254, 253, 252, 251}},
},
},
+ tls13Variant: TLS13Experiment,
messageCount: 2,
resumeSession: true,
flags: []string{
"-enable-early-data",
"-expect-accept-early-data",
- "-tls13-variant", "1",
},
})
@@ -4251,21 +4250,20 @@
testType: serverTest,
name: "TLS13RecordTypeExperiment-EarlyData-Server",
config: Config{
- MaxVersion: VersionTLS13,
- MinVersion: VersionTLS13,
- TLS13Variant: TLS13RecordTypeExperiment,
+ MaxVersion: VersionTLS13,
+ MinVersion: VersionTLS13,
Bugs: ProtocolBugs{
SendEarlyData: [][]byte{{1, 2, 3, 4}},
ExpectEarlyDataAccepted: true,
ExpectHalfRTTData: [][]byte{{254, 253, 252, 251}},
},
},
+ tls13Variant: TLS13RecordTypeExperiment,
messageCount: 2,
resumeSession: true,
flags: []string{
"-enable-early-data",
"-expect-accept-early-data",
- "-tls13-variant", "2",
},
})
@@ -10637,26 +10635,24 @@
testType: serverTest,
name: "SkipEarlyData-TLS13Experiment",
config: Config{
- MaxVersion: VersionTLS13,
- TLS13Variant: TLS13Experiment,
+ MaxVersion: VersionTLS13,
Bugs: ProtocolBugs{
SendFakeEarlyDataLength: 4,
},
},
- flags: []string{"-tls13-variant", "1"},
+ tls13Variant: TLS13Experiment,
})
testCases = append(testCases, testCase{
testType: serverTest,
name: "SkipEarlyData-TLS13RecordTypeExperiment",
config: Config{
- MaxVersion: VersionTLS13,
- TLS13Variant: TLS13RecordTypeExperiment,
+ MaxVersion: VersionTLS13,
Bugs: ProtocolBugs{
SendFakeEarlyDataLength: 4,
},
},
- flags: []string{"-tls13-variant", "2"},
+ tls13Variant: TLS13RecordTypeExperiment,
})
testCases = append(testCases, testCase{