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

fix: broken code during merge

Browse source
This commit is contained in:
Mingye Chen 2025-01-09 20:29:38 -07:00
parent cefe226467
commit ff854c45c6
2 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
handshake_client_tls13.go
View file

@ -124,14 +124,14 @@ func (hs *clientHandshakeStateTLS13) handshake() error {
// set echdheParams to what we received from server // set echdheParams to what we received from server
if ecdheKey, ok := hs.keySharesParams.GetEcdheKey(hs.serverHello.serverShare.group); ok { if ecdheKey, ok := hs.keySharesParams.GetEcdheKey(hs.serverHello.serverShare.group); ok {
hs.keyShareKeys.ecdhe = ecdheKey hs.keyShareKeys.ecdhe = ecdheKey
hs.keyShareKeys.kyber = nil // unset kyber if any hs.keyShareKeys.curveID = hs.serverHello.serverShare.group
} }
// set kemParams to what we received from server // set kemParams to what we received from server
if kemKey, ok := hs.keySharesParams.GetKemKey(hs.serverHello.serverShare.group); ok { if kemKey, ok := hs.keySharesParams.GetKemKey(hs.serverHello.serverShare.group); ok {
if gokey, err := mlkemCirclToGo(kemKey); err == nil { if kyberKey, ecdhKey, err := mlkemCirclToGo(kemKey); err == nil {
hs.keyShareKeys.kyber = gokey hs.keyShareKeys.kyber = kyberKey
hs.keyShareKeys.ecdhe = ecdhKey
hs.keyShareKeys.curveID = hs.serverHello.serverShare.group hs.keyShareKeys.curveID = hs.serverHello.serverShare.group
hs.keyShareKeys.ecdhe = nil // unset ecdheKey if any
} }
} }
// [uTLS SECTION END] // [uTLS SECTION END]

42
u_public.go
View file

@ -8,11 +8,12 @@ import (
"crypto" "crypto"
"crypto/ecdh" "crypto/ecdh"
"crypto/x509" "crypto/x509"
"fmt"
"hash" "hash"
"time" "time"
"github.com/cloudflare/circl/kem" "github.com/cloudflare/circl/kem"
"github.com/cloudflare/circl/kem/kyber/kyber768" "github.com/cloudflare/circl/kem/hybrid"
"github.com/refraction-networking/utls/internal/mlkem768" "github.com/refraction-networking/utls/internal/mlkem768"
) )
@ -40,7 +41,6 @@ type PubClientHandshakeState struct {
// TLS 1.3 only // TLS 1.3 only
type TLS13OnlyState struct { type TLS13OnlyState struct {
// Deprecated: Use KeyShareKeys instead.
EcdheKey *ecdh.PrivateKey EcdheKey *ecdh.PrivateKey
KeySharesParams *KeySharesParameters KeySharesParams *KeySharesParameters
KEMKey *KemPrivateKey KEMKey *KemPrivateKey
@ -62,13 +62,30 @@ type TLS12OnlyState struct {
Suite PubCipherSuite Suite PubCipherSuite
} }
func mlkemCirclToGo(circlKey kem.PrivateKey) (*mlkem768.DecapsulationKey, error) { func mlkemCirclToGo(circlKey kem.PrivateKey) (*mlkem768.DecapsulationKey, *ecdh.PrivateKey, error) {
encodedKey, err := circlKey.MarshalBinary() if circlKey.Scheme().Name() != "Kyber768-X25519" {
if err != nil { return nil, nil, fmt.Errorf("circl key is not Kyber768-X25519")
return nil, err
} }
return mlkem768.NewKeyFromExtendedEncoding(encodedKey) encodedKey, err := circlKey.MarshalBinary()
if err != nil {
return nil, nil, err
}
ecdhKey := encodedKey[:x25519PublicKeySize]
kyberKey := encodedKey[x25519PublicKeySize:]
goKyberkey, err := mlkem768.NewKeyFromExtendedEncoding(kyberKey)
if err != nil {
return nil, nil, err
}
goEcdhKey, err := ecdh.X25519().NewPrivateKey(ecdhKey)
if err != nil {
return nil, nil, err
}
return goKyberkey, goEcdhKey, nil
} }
func (chs *TLS13OnlyState) private13KeyShareKeys() *keySharePrivateKeys { func (chs *TLS13OnlyState) private13KeyShareKeys() *keySharePrivateKeys {
@ -77,9 +94,10 @@ func (chs *TLS13OnlyState) private13KeyShareKeys() *keySharePrivateKeys {
} }
if chs.KEMKey != nil { if chs.KEMKey != nil {
if key, err := mlkemCirclToGo(chs.KEMKey.SecretKey); err == nil { if kyberKey, ecdhKey, err := mlkemCirclToGo(chs.KEMKey.SecretKey); err == nil {
return &keySharePrivateKeys{ return &keySharePrivateKeys{
kyber: key, kyber: kyberKey,
ecdhe: ecdhKey,
} }
} }
} }
@ -94,8 +112,9 @@ func (chs *TLS13OnlyState) private13KeyShareKeys() *keySharePrivateKeys {
} }
func (ksp *keySharePrivateKeys) publicKEMKey() *KemPrivateKey { func (ksp *keySharePrivateKeys) publicKEMKey() *KemPrivateKey {
if ksp.kyber != nil { if ksp.kyber != nil && ksp.ecdhe != nil && ksp.curveID == x25519Kyber768Draft00 {
if privkey, err := kyber768.Scheme().UnmarshalBinaryPrivateKey(ksp.kyber.Bytes()); err == nil { key := append(ksp.ecdhe.Bytes(), ksp.kyber.Bytes()...)
if privkey, err := hybrid.Kyber768X25519().UnmarshalBinaryPrivateKey(key); err == nil {
return &KemPrivateKey{ return &KemPrivateKey{
SecretKey: privkey, SecretKey: privkey,
} }
@ -114,6 +133,7 @@ func (chs *PubClientHandshakeState) toPrivate13() *clientHandshakeStateTLS13 {
serverHello: chs.ServerHello.getPrivatePtr(), serverHello: chs.ServerHello.getPrivatePtr(),
hello: chs.Hello.getPrivatePtr(), hello: chs.Hello.getPrivatePtr(),
keyShareKeys: chs.State13.private13KeyShareKeys(), keyShareKeys: chs.State13.private13KeyShareKeys(),
keySharesParams: chs.State13.KeySharesParams,
session: chs.Session, session: chs.Session,
earlySecret: chs.State13.EarlySecret, earlySecret: chs.State13.EarlySecret,