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

fix: ech with helloGolang

Browse source
This commit is contained in:
Mingye Chen 2025-03-21 00:19:45 -06:00
parent f6f3c9867d
commit c4f35cbdf6
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
handshake_messages.go
View file

@ -262,14 +262,18 @@ func (m *clientHelloMsg) marshalMsgReorderOuterExts(echInner bool, outerExts []u
} }
if len(m.supportedVersions) > 0 { if len(m.supportedVersions) > 0 {
// RFC 8446, Section 4.2.1 // RFC 8446, Section 4.2.1
exts.AddUint16(extensionSupportedVersions) if echInner && outerExts == nil { // uTLS
exts.AddUint16LengthPrefixed(func(exts *cryptobyte.Builder) { echOuterExts = append(echOuterExts, extensionSupportedVersions)
exts.AddUint8LengthPrefixed(func(exts *cryptobyte.Builder) { } else {
for _, vers := range m.supportedVersions { exts.AddUint16(extensionSupportedVersions)
exts.AddUint16(vers) exts.AddUint16LengthPrefixed(func(exts *cryptobyte.Builder) {
} exts.AddUint8LengthPrefixed(func(exts *cryptobyte.Builder) {
for _, vers := range m.supportedVersions {
exts.AddUint16(vers)
}
})
}) })
}) }
} }
if len(m.cookie) > 0 { if len(m.cookie) > 0 {
// RFC 8446, Section 4.2.2 // RFC 8446, Section 4.2.2

2
u_handshake_client.go
View file

@ -483,7 +483,7 @@ func (c *UConn) clientHandshake(ctx context.Context) (err error) {
}() }()
} }
if ech != nil && c.clientHelloBuildStatus == BuildByGoTLS { if ech != nil && c.clientHelloBuildStatus != BuildByUtls {
// Split hello into inner and outer // Split hello into inner and outer
ech.innerHello = hello.clone() ech.innerHello = hello.clone()