Fix bogo implementation of Channel ID for TLS < 1.2.
BUG=103
Change-Id: I9a49fbaf66af73978ce264d27926f483e1e44766
Reviewed-on: https://boringssl-review.googlesource.com/11620
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/ssl/test/runner/handshake_client.go b/ssl/test/runner/handshake_client.go
index 54a585f..09c1c9a 100644
--- a/ssl/test/runner/handshake_client.go
+++ b/ssl/test/runner/handshake_client.go
@@ -1293,7 +1293,7 @@
vers: c.vers,
cipherSuite: hs.suite.id,
masterSecret: hs.masterSecret,
- handshakeHash: hs.finishedHash.server.Sum(nil),
+ handshakeHash: hs.finishedHash.Sum(),
serverCertificates: c.peerCertificates,
sctList: c.sctList,
ocspResponse: c.ocspResponse,
diff --git a/ssl/test/runner/handshake_server.go b/ssl/test/runner/handshake_server.go
index 43deb2e..eb47bc4 100644
--- a/ssl/test/runner/handshake_server.go
+++ b/ssl/test/runner/handshake_server.go
@@ -1630,7 +1630,7 @@
cipherSuite: hs.suite.id,
masterSecret: hs.masterSecret,
certificates: hs.certsFromClient,
- handshakeHash: hs.finishedHash.server.Sum(nil),
+ handshakeHash: hs.finishedHash.Sum(),
}
if !hs.hello.extensions.ticketSupported || hs.c.config.Bugs.SkipNewSessionTicket {
diff --git a/ssl/test/runner/prf.go b/ssl/test/runner/prf.go
index 6c83347..dff8534 100644
--- a/ssl/test/runner/prf.go
+++ b/ssl/test/runner/prf.go
@@ -357,7 +357,7 @@
hash.Write(channelIDResumeLabel)
hash.Write(resumeHash)
}
- hash.Write(h.server.Sum(nil))
+ hash.Write(h.Sum())
return hash.Sum(nil)
}
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index eb4c996..48d3340 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -3942,7 +3942,7 @@
// Test Channel ID
for _, ver := range tlsVersions {
- if ver.version < VersionTLS12 {
+ if ver.version < VersionTLS10 {
continue
}
// Client sends a Channel ID.
