qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 04:40:24 -07:00
Code Releases Activity

crypto/tls: Enforce that version and cipher match on resume.

Browse Source 
Per RFC 5246, 7.4.1.3:

   cipher_suite
      The single cipher suite selected by the server from the list in
      ClientHello.cipher_suites.  For resumed sessions, this field is
      the value from the state of the session being resumed.

The specifications are not very clearly written about resuming sessions
at the wrong version (i.e. is the TLS 1.0 notion of "session" the same
type as the TLS 1.1 notion of "session"?). But every other
implementation enforces this check and not doing so has some odd
semantics.

Change-Id: I6234708bd02b636c25139d83b0d35381167e5cad
Reviewed-on: https://go-review.googlesource.com/21153
Reviewed-by: Adam Langley <agl@golang.org>
This commit is contained in:
David Benjamin 2016-02-15 11:51:54 -05:00 committed by Adam Langley
parent c9b66bb355
commit 73a0185ad3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/crypto/tls/handshake_client.go
View File

@ -556,6 +556,16 @@ func (hs *clientHandshakeState) processServerHello() (bool, error) {
return false, nil return false, nil
} }
if hs.session.vers != c.vers {
c.sendAlert(alertHandshakeFailure)
return false, errors.New("tls: server resumed a session with a different version")
}
if hs.session.cipherSuite != hs.suite.id {
c.sendAlert(alertHandshakeFailure)
return false, errors.New("tls: server resumed a session with a different cipher suite")
}
// Restore masterSecret and peerCerts from previous state // Restore masterSecret and peerCerts from previous state
hs.masterSecret = hs.session.masterSecret hs.masterSecret = hs.session.masterSecret
c.peerCertificates = hs.session.serverCertificates c.peerCertificates = hs.session.serverCertificates