Skip to content

Commit eed2208

Browse files
FiloSottilegopherbot
authored andcommitted
crypto/tls: require EMS in FIPS 140-3 mode
See Implementation Guidance D.Q. Change-Id: I6a6a465607da94f2bb249934f0561ae04a55e7b7 Reviewed-on: https://go-review.googlesource.com/c/go/+/650575 Reviewed-by: Daniel McCarney <daniel@binaryparadox.net> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Pratt <mpratt@google.com> Auto-Submit: Filippo Valsorda <filippo@golang.org> Reviewed-by: Roland Shoemaker <roland@golang.org>
1 parent 77ce76d commit eed2208

3 files changed

Lines changed: 19 additions & 0 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
When [FIPS 140-3 mode](/doc/security/fips140) is enabled, Extended Master Secret
2+
is now required in TLS 1.2.

‎src/crypto/tls/handshake_client.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,11 @@ func (c *Conn) loadSession(hello *clientHelloMsg) (
462462
return nil, nil, nil, nil
463463
}
464464

465+
// FIPS 140-3 requires the use of Extended Master Secret.
466+
if !session.extMasterSecret && fips140tls.Required() {
467+
return nil, nil, nil, nil
468+
}
469+
465470
hello.sessionTicket = session.ticket
466471
return
467472
}
@@ -781,6 +786,10 @@ func (hs *clientHandshakeState) doFullHandshake() error {
781786
hs.masterSecret = extMasterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
782787
hs.finishedHash.Sum())
783788
} else {
789+
if fips140tls.Required() {
790+
c.sendAlert(alertHandshakeFailure)
791+
return errors.New("tls: FIPS 140-3 requires the use of Extended Master Secret")
792+
}
784793
hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
785794
hs.hello.random, hs.serverHello.random)
786795
}

‎src/crypto/tls/handshake_server.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,10 @@ func (hs *serverHandshakeState) checkForResumption() error {
527527
// weird downgrade in client capabilities.
528528
return errors.New("tls: session supported extended_master_secret but client does not")
529529
}
530+
if !sessionState.extMasterSecret && fips140tls.Required() {
531+
// FIPS 140-3 requires the use of Extended Master Secret.
532+
return nil
533+
}
530534

531535
c.peerCertificates = sessionState.peerCertificates
532536
c.ocspResponse = sessionState.ocspResponse
@@ -713,6 +717,10 @@ func (hs *serverHandshakeState) doFullHandshake() error {
713717
hs.masterSecret = extMasterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
714718
hs.finishedHash.Sum())
715719
} else {
720+
if fips140tls.Required() {
721+
c.sendAlert(alertHandshakeFailure)
722+
return errors.New("tls: FIPS 140-3 requires the use of Extended Master Secret")
723+
}
716724
hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
717725
hs.clientHello.random, hs.hello.random)
718726
}

0 commit comments

Comments
 (0)