crypto/tls: add verifiedChains expiration checking during resumption

When resuming a session, check that the verifiedChains contain at least
one chain that is still valid at the time of resumption. If not, trigger
a new handshake.

Updates #77113
Updates #77217
Updates CVE-2025-68121

Change-Id: I14f585c43da17802513cbdd5b10c552d7a38b34e
Reviewed-on: https://go-review.googlesource.com/c/go/+/739321
Reviewed-by: Coia Prant <coiaprant@gmail.com>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Auto-Submit: Roland Shoemaker <roland@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
yuhan6665
2026-09-08 21:33:46 -04:00
parent 7103a0cf07
commit f07a54079c
4 changed files with 22 additions and 5 deletions
+13
View File
@@ -1880,3 +1880,16 @@ func fipsAllowChain(chain []*x509.Certificate) bool {
return true
}
// anyUnexpiredChain reports if at least one of verifiedChains is still
// unexpired. If verifiedChains is empty, it returns false.
func anyUnexpiredChain(verifiedChains [][]*x509.Certificate, now time.Time) bool {
for _, chain := range verifiedChains {
if len(chain) != 0 && !slices.ContainsFunc(chain, func(cert *x509.Certificate) bool {
return now.Before(cert.NotBefore) || now.After(cert.NotAfter) // cert is expired
}) {
return true
}
}
return false
}
+7 -3
View File
@@ -399,9 +399,6 @@ func (c *Conn) loadSession(hello *clientHelloMsg) (
return nil, nil, nil, nil
}
// Check that the cached server certificate is not expired, and that it's
// valid for the ServerName. This should be ensured by the cache key, but
// protect the application from a faulty ClientSessionCache implementation.
if c.config.time().After(session.peerCertificates[0].NotAfter) {
// Expired certificate, delete the entry.
c.config.ClientSessionCache.Put(cacheKey, nil)
@@ -413,6 +410,13 @@ func (c *Conn) loadSession(hello *clientHelloMsg) (
return nil, nil, nil, nil
}
if err := session.peerCertificates[0].VerifyHostname(c.config.ServerName); err != nil {
// This should be ensured by the cache key, but protect the
// application from a faulty ClientSessionCache implementation.
return nil, nil, nil, nil
}
if !anyUnexpiredChain(session.verifiedChains, c.config.time()) {
// No valid chains, delete the entry.
c.config.ClientSessionCache.Put(cacheKey, nil)
return nil, nil, nil, nil
}
}
+1 -1
View File
@@ -511,7 +511,7 @@ func (hs *serverHandshakeState) checkForResumption() error {
return nil
}
if sessionHasClientCerts && c.config.ClientAuth >= VerifyClientCertIfGiven &&
len(sessionState.verifiedChains) == 0 {
!anyUnexpiredChain(sessionState.verifiedChains, c.config.time()) {
return nil
}
+1 -1
View File
@@ -465,7 +465,7 @@ func (hs *serverHandshakeStateTLS13) checkForResumption() error {
continue
}
if sessionHasClientCerts && c.config.ClientAuth >= VerifyClientCertIfGiven &&
len(sessionState.verifiedChains) == 0 {
!anyUnexpiredChain(sessionState.verifiedChains, c.config.time()) {
continue
}