Fix client key share

This commit is contained in:
Henry Case 2019-05-12 20:29:10 +01:00
parent 70a7cea10b
commit 4a7cf1bb76

2
13.go
View File

@ -460,7 +460,6 @@ func (hs *serverHandshakeState) readClientFinished13(hasConfirmLock bool) error
c.in.traceErr, c.out.traceErr = nil, nil c.in.traceErr, c.out.traceErr = nil, nil
c.phase = handshakeConfirmed c.phase = handshakeConfirmed
atomic.StoreInt32(&c.handshakeConfirmed, 1) atomic.StoreInt32(&c.handshakeConfirmed, 1)
hs.c.Group = hs.hello.keyShare.group
// Any read operation after handshakeRunning and before handshakeConfirmed // Any read operation after handshakeRunning and before handshakeConfirmed
// will be holding this lock, which we release as soon as the confirmation // will be holding this lock, which we release as soon as the confirmation
@ -1203,6 +1202,7 @@ func (hs *clientHandshakeState) doTLS13Handshake() error {
return errors.New("tls: unexpected data after handshake") return errors.New("tls: unexpected data after handshake")
} }
c.in.setCipher(c.vers, appServerCipher) c.in.setCipher(c.vers, appServerCipher)
hs.c.Group = serverHello.keyShare.group
return nil return nil
} }