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

sync: merge changes from go 1.23.4

Browse source
This commit is contained in:
Mingye Chen 2025-01-07 15:55:09 -07:00
commit cefe226467
98 changed files with 8089 additions and 4530 deletions
Download patch file Download diff file Expand all files Collapse all files

17
u_conn.go
View file

@ -9,13 +9,14 @@ import (
"bytes"
"context"
"crypto/cipher"
"crypto/ecdh"
"encoding/binary"
"errors"
"fmt"
"hash"
"net"
"strconv"
"github.com/cloudflare/circl/kem/mlkem/mlkem768"
)
type ClientHelloBuildStatus int
@ -108,16 +109,18 @@ func (uconn *UConn) buildHandshakeState(loadSession bool) error {
uAssert(uconn.clientHelloBuildStatus == NotBuilt, "BuildHandshakeState failed: invalid call, client hello has already been built by utls")
// use default Golang ClientHello.
hello, keySharePrivate, err := uconn.makeClientHello()
hello, keySharePrivate, _, err := uconn.makeClientHello()
if err != nil {
return err
}
uconn.HandshakeState.Hello = hello.getPublicPtr()
if ecdheKey, ok := keySharePrivate.(*ecdh.PrivateKey); ok {
uconn.HandshakeState.State13.EcdheKey = ecdheKey
} else if kemKey, ok := keySharePrivate.(*kemPrivateKey); ok {
uconn.HandshakeState.State13.KEMKey = kemKey.ToPublic()
if keySharePrivate.ecdhe != nil {
uconn.HandshakeState.State13.EcdheKey = keySharePrivate.ecdhe
} else if keySharePrivate.kyber != nil {
kemPrivKey := &mlkem768.PrivateKey{}
kemPrivKey.Unpack(keySharePrivate.kyber.EncapsulationKey())
uconn.HandshakeState.State13.KEMKey = &KemPrivateKey{CurveID: keySharePrivate.curveID, SecretKey: kemPrivKey}
} else {
return fmt.Errorf("uTLS: unknown keySharePrivate type: %T", keySharePrivate)
}
@ -214,7 +217,7 @@ func (uconn *UConn) DidTls12Resume() bool {
func (uconn *UConn) SetSessionState(session *ClientSessionState) error {
sessionTicketExt := &SessionTicketExtension{Initialized: true}
if session != nil {
sessionTicketExt.Ticket = session.ticket
sessionTicketExt.Ticket = session.session.ticket
sessionTicketExt.Session = session.session
}
return uconn.SetSessionTicketExtension(sessionTicketExt)