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

Correctly handle HelloRetryRequest

Browse source
This commit is contained in:
Sergey Frolov 2019-02-09 19:31:35 -07:00 • committed by sergeyfrolov
parent 3fe91d9822
commit 1188641a16
7 changed files with 307 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
u_conn.go
View file

@ -41,6 +41,7 @@ func UClient(conn net.Conn, config *Config, clientHelloID ClientHelloID) *UConn
tlsConn := Conn{conn: conn, config: config, isClient: true}
handshakeState := ClientHandshakeState{C: &tlsConn, Hello: &ClientHelloMsg{}}
uconn := UConn{Conn: &tlsConn, clientHelloID: clientHelloID, HandshakeState: handshakeState}
uconn.HandshakeState.uconn = &uconn
return &uconn
}
@ -368,7 +369,7 @@ func (c *UConn) clientHandshake() (err error) {
hs12.serverHello = serverHello
hs12.hello = hello
err = hs12.handshake()
c.HandshakeState = *hs12.toPublic13()
c.HandshakeState = *hs12.toPublic12()
if err != nil {
return err
}
@ -509,6 +510,9 @@ func (uconn *UConn) GetUnderlyingConn() net.Conn {
func MakeConnWithCompleteHandshake(tcpConn net.Conn, version uint16, cipherSuite uint16, masterSecret []byte, clientRandom []byte, serverRandom []byte, isClient bool) *Conn {
tlsConn := &Conn{conn: tcpConn, config: &Config{}, isClient: isClient}
cs := cipherSuiteByID(cipherSuite)
if cs == nil {
return nil
}
// This is mostly borrowed from establishKeys()
clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV :=