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

resolved [uTLS section] problems

Browse source
This commit is contained in:
Chaos Pjeles 2023-03-20 22:08:28 +00:00
parent e1cc6b186d
commit 830f46591b
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
handshake_client.go
View file

@ -224,7 +224,7 @@ func (c *Conn) clientHandshake(ctx context.Context) (err error) {
serverHello: serverHello, serverHello: serverHello,
hello: hello, hello: hello,
ecdheParams: ecdheParams, ecdheParams: ecdheParams,
keySharesEcdheParams: make(KeySharesEcdheParameters, 2), keySharesEcdheParams: make(KeySharesEcdheParameters, 2), // [uTLS]
session: session, session: session,
earlySecret: earlySecret, earlySecret: earlySecret,
binderKey: binderKey, binderKey: binderKey,

8
handshake_client_tls13.go
View file

@ -17,6 +17,7 @@ import (
"time" "time"
) )
// [uTLS SECTION START]
type KeySharesEcdheParameters map[CurveID]ecdheParameters type KeySharesEcdheParameters map[CurveID]ecdheParameters
func (keymap KeySharesEcdheParameters) AddEcdheParams(curveID CurveID, params ecdheParameters) { func (keymap KeySharesEcdheParameters) AddEcdheParams(curveID CurveID, params ecdheParameters) {
@ -31,13 +32,15 @@ func (keymap KeySharesEcdheParameters) GetPublicEcdheParams(curveID CurveID) (pa
return return
} }
// [uTLS SECTION END]
type clientHandshakeStateTLS13 struct { type clientHandshakeStateTLS13 struct {
c *Conn c *Conn
ctx context.Context ctx context.Context
serverHello *serverHelloMsg serverHello *serverHelloMsg
hello *clientHelloMsg hello *clientHelloMsg
ecdheParams ecdheParameters ecdheParams ecdheParameters
keySharesEcdheParams KeySharesEcdheParameters // [UTLS] keySharesEcdheParams KeySharesEcdheParameters // [uTLS]
session *ClientSessionState session *ClientSessionState
earlySecret []byte earlySecret []byte
@ -70,10 +73,13 @@ func (hs *clientHandshakeStateTLS13) handshake() error {
return errors.New("tls: server selected TLS 1.3 in a renegotiation") return errors.New("tls: server selected TLS 1.3 in a renegotiation")
} }
// [uTLS SECTION START]
// set echdheParams to what we received from server // set echdheParams to what we received from server
if ecdheParams, ok := hs.keySharesEcdheParams.GetEcdheParams(hs.serverHello.serverShare.group); ok { if ecdheParams, ok := hs.keySharesEcdheParams.GetEcdheParams(hs.serverHello.serverShare.group); ok {
hs.ecdheParams = ecdheParams hs.ecdheParams = ecdheParams
} }
// [uTLS SECTION END]
// Consistency check on the presence of a keyShare and its parameters. // Consistency check on the presence of a keyShare and its parameters.
if hs.ecdheParams == nil || len(hs.hello.keyShares) < 1 { // [uTLS] if hs.ecdheParams == nil || len(hs.hello.keyShares) < 1 { // [uTLS]