Add Experiment 2
Change-Id: If240cbeb133a23331cb6ca59eaacde7733592278
Reviewed-on: https://boringssl-review.googlesource.com/20144
Reviewed-by: Steven Valdez <svaldez@google.com>
Commit-Queue: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/ssl/test/runner/conn.go b/ssl/test/runner/conn.go
index 2332e6b..615e224 100644
--- a/ssl/test/runner/conn.go
+++ b/ssl/test/runner/conn.go
@@ -781,6 +781,9 @@
if c.vers >= VersionTLS13 {
expect = VersionTLS10
}
+ if c.wireVersion == tls13Experiment2Version {
+ expect = VersionTLS12
+ }
} else {
expect = c.config.Bugs.ExpectInitialRecordVersion
}
@@ -929,7 +932,7 @@
c.in.setErrorLocked(c.sendAlert(alertUnexpectedMessage))
break
}
- if c.wireVersion != tls13ExperimentVersion {
+ if !isResumptionExperiment(c.wireVersion) {
err := c.in.changeCipherSpec(c.config)
if err != nil {
c.in.setErrorLocked(c.sendAlert(err.(alert)))
@@ -1125,6 +1128,10 @@
// layer to {3, 1}.
vers = VersionTLS10
}
+ if c.wireVersion == tls13Experiment2Version {
+ vers = VersionTLS12
+ }
+
if c.config.Bugs.SendRecordVersion != 0 {
vers = c.config.Bugs.SendRecordVersion
}
@@ -1156,7 +1163,7 @@
}
c.out.freeBlock(b)
- if typ == recordTypeChangeCipherSpec && c.wireVersion != tls13ExperimentVersion {
+ if typ == recordTypeChangeCipherSpec && !isResumptionExperiment(c.wireVersion) {
err = c.out.changeCipherSpec(c.config)
if err != nil {
return n, c.sendAlertLocked(alertLevelError, err.(alert))