runner: Remove unnecessary config parameter to hc.changeCipherSpec Setting hc.config is unnecessary because the config pointer will not change from the original value. Change-Id: Ib237c78554f2e810f4e9dda8eda279a7b96e9c57 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/72647 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Nick Harper <nharper@chromium.org>
diff --git a/ssl/test/runner/conn.go b/ssl/test/runner/conn.go index 525f85f..9ac2323 100644 --- a/ssl/test/runner/conn.go +++ b/ssl/test/runner/conn.go
@@ -228,7 +228,7 @@ // changeCipherSpec changes the encryption and MAC states // to the ones previously passed to prepareCipherSpec. -func (hc *halfConn) changeCipherSpec(config *Config) error { +func (hc *halfConn) changeCipherSpec() error { if hc.nextCipher == nil { return alertInternalError } @@ -236,10 +236,9 @@ hc.mac = hc.nextMac hc.nextCipher = nil hc.nextMac = nil - hc.config = config hc.incEpoch() - if config.Bugs.NullAllCiphers { + if hc.config.Bugs.NullAllCiphers { hc.cipher = nullCipher{} hc.mac = nil } @@ -1089,7 +1088,7 @@ c.in.setErrorLocked(errors.New("tls: buffered handshake messages on cipher change")) break } - if err := c.in.changeCipherSpec(c.config); err != nil { + if err := c.in.changeCipherSpec(); err != nil { c.in.setErrorLocked(c.sendAlert(err.(alert))) } @@ -1298,7 +1297,7 @@ } if typ == recordTypeChangeCipherSpec && c.vers < VersionTLS13 { - err = c.out.changeCipherSpec(c.config) + err = c.out.changeCipherSpec() if err != nil { return n, c.sendAlertLocked(alertLevelError, err.(alert)) }
diff --git a/ssl/test/runner/dtls.go b/ssl/test/runner/dtls.go index f3101b2..ad7d40f 100644 --- a/ssl/test/runner/dtls.go +++ b/ssl/test/runner/dtls.go
@@ -273,7 +273,7 @@ } if typ == recordTypeChangeCipherSpec && c.vers < VersionTLS13 { - err = c.out.changeCipherSpec(c.config) + err = c.out.changeCipherSpec() if err != nil { return n, c.sendAlertLocked(alertLevelError, err.(alert)) }