mirror of
https://github.com/golang/go.git
synced 2025-05-05 15:43:04 +00:00
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>
This commit is contained in:
parent
77ce76d761
commit
eed2208f15
2
doc/next/6-stdlib/99-minor/crypto/tls/fips.md
Normal file
2
doc/next/6-stdlib/99-minor/crypto/tls/fips.md
Normal file
@ -0,0 +1,2 @@
|
||||
When [FIPS 140-3 mode](/doc/security/fips140) is enabled, Extended Master Secret
|
||||
is now required in TLS 1.2.
|
@ -462,6 +462,11 @@ func (c *Conn) loadSession(hello *clientHelloMsg) (
|
||||
return nil, nil, nil, nil
|
||||
}
|
||||
|
||||
// FIPS 140-3 requires the use of Extended Master Secret.
|
||||
if !session.extMasterSecret && fips140tls.Required() {
|
||||
return nil, nil, nil, nil
|
||||
}
|
||||
|
||||
hello.sessionTicket = session.ticket
|
||||
return
|
||||
}
|
||||
@ -781,6 +786,10 @@ func (hs *clientHandshakeState) doFullHandshake() error {
|
||||
hs.masterSecret = extMasterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
|
||||
hs.finishedHash.Sum())
|
||||
} else {
|
||||
if fips140tls.Required() {
|
||||
c.sendAlert(alertHandshakeFailure)
|
||||
return errors.New("tls: FIPS 140-3 requires the use of Extended Master Secret")
|
||||
}
|
||||
hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
|
||||
hs.hello.random, hs.serverHello.random)
|
||||
}
|
||||
|
@ -527,6 +527,10 @@ func (hs *serverHandshakeState) checkForResumption() error {
|
||||
// weird downgrade in client capabilities.
|
||||
return errors.New("tls: session supported extended_master_secret but client does not")
|
||||
}
|
||||
if !sessionState.extMasterSecret && fips140tls.Required() {
|
||||
// FIPS 140-3 requires the use of Extended Master Secret.
|
||||
return nil
|
||||
}
|
||||
|
||||
c.peerCertificates = sessionState.peerCertificates
|
||||
c.ocspResponse = sessionState.ocspResponse
|
||||
@ -713,6 +717,10 @@ func (hs *serverHandshakeState) doFullHandshake() error {
|
||||
hs.masterSecret = extMasterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
|
||||
hs.finishedHash.Sum())
|
||||
} else {
|
||||
if fips140tls.Required() {
|
||||
c.sendAlert(alertHandshakeFailure)
|
||||
return errors.New("tls: FIPS 140-3 requires the use of Extended Master Secret")
|
||||
}
|
||||
hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret,
|
||||
hs.clientHello.random, hs.hello.random)
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user