mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 20:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Lock sessionController only on last call to BuildHandshakeState

Browse source
This commit is contained in:
Amir Khan 2024-06-19 13:41:08 -04:00
parent 4f713392d1
commit ebe5d664d2
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
u_conn.go
View file

@ -125,12 +125,18 @@ func (uconn *UConn) BuildHandshakeState() error {
return err
}
err = uconn.uLoadSession()
err = uconn.MarshalClientHello()
if err != nil {
return err
}
err = uconn.MarshalClientHello()
}
return nil
}
func (uconn *UConn) lockSessionState() error {
err := uconn.uLoadSession()
if err != nil {
return err
}
@ -139,7 +145,7 @@ func (uconn *UConn) BuildHandshakeState() error {
uconn.sessionController.finalCheck()
uconn.clientHelloBuildStatus = BuildByUtls
}
return nil
}
@ -358,6 +364,10 @@ func (c *UConn) handshakeContext(ctx context.Context) (ret error) {
if err != nil {
return err
}
err = c.lockSessionState()
if err != nil {
return err
}
}
// [uTLS section ends]
c.handshakeErr = c.handshakeFn(handshakeCtx)
@ -983,6 +993,9 @@ func (c *UConn) handleRenegotiation() error {
if err = c.BuildHandshakeState(); err != nil {
return err
}
if err = c.lockSessionState(); err != nil {
return err
}
// [uTLS section ends]
if c.handshakeErr = c.clientHandshake(context.Background()); c.handshakeErr == nil {
c.handshakes++

5
u_conn_test.go
View file

@ -512,6 +512,11 @@ func (test *clientTest) runUTLS(t *testing.T, write bool, hello helloStrategy, o
t.Errorf("Client.BuildHandshakeState() failed: %s", err)
return
}
err = client.lockSessionState()
if err != nil {
t.Errorf("Client.lockSessionState() failed: %s", err)
return
}
// TODO: fix this name hack if we ever decide to use non-standard testing object
err = client.SetClientRandom([]byte("Custom ClientRandom h^xbw8bf0sn3"))
if err != nil {