[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / crypto / tls / handshake_server.go

diff --git a/src/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
index 07e388a35ebf977eaff5df7a95f5595d2254aac5..5b1aa64166b30b783b084050e2ff3bb8709612e9 100644 (file)
--- a/src/crypto/tls/handshake_server.go
+++ b/src/crypto/tls/handshake_server.go
@@ -36,7 +36,6 @@ type serverHandshakeState struct {
 }
 
 // serverHandshake performs a TLS handshake as a server.
-// c.out.Mutex <= L; c.handshakeMutex <= L.
 func (c *Conn) serverHandshake() error {
        // If this is the first server handshake, we generate a random key to
        // encrypt the tickets with.
@@ -103,6 +102,8 @@ func (c *Conn) serverHandshake() error {
                        return err
                }
        }
+
+       c.ekm = ekmFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.clientHello.random, hs.hello.random)
        c.handshakeComplete = true
 
        return nil