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

Fix bugs: properly check if an extension/curve/cipherSuit is GREASE.

Browse source 
The current version does not properly check GREASE in many cases. In
particular, it compares an extension ID, a curve ID, or a CipherSuit
against a constant value GREASE_PLACEHOLDER (0x0a0a), without
unGREASEing it first.

To fix this problem, we simply use the existing function:
isGREASEUint16() with some necessary casting.

For the records, some error messages related to this bug are:

* "applying generated spec failed: uTLS does not support 0xBABA as max version"

* "applying generated spec failed: unsupported Curve in
KeyShareExtension: CurveID(56026).To mimic it, fill the Data(key)
field manually"
This commit is contained in:
gfw-report 2022-12-14 00:00:00 +00:00
parent 1af5ecda3e
commit 8b0717cad1
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
u_conn.go
View file

@ -596,7 +596,7 @@ func (uconn *UConn) SetTLSVers(minTLSVers, maxTLSVers uint16, specExtensions []T
minVers := uint16(0)
maxVers := uint16(0)
for _, vers := range versions {
if vers == GREASE_PLACEHOLDER {
if isGREASEUint16(vers) {
continue
}
if maxVers < vers || maxVers == 0 {

2
u_fingerprinter.go
View file

@ -277,7 +277,7 @@ func (f *Fingerprinter) FingerprintClientHello(data []byte) (*ClientHelloSpec, e
ks.Group = CurveID(unGREASEUint16(group))
// if not GREASE, key share data will be discarded as it should
// be generated per connection
if ks.Group != GREASE_PLACEHOLDER {
if !isGREASEUint16(group) {
ks.Data = nil
}
keyShares = append(keyShares, ks)

8
u_parrots.go
View file

@ -1984,7 +1984,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
hello.CipherSuites = make([]uint16, len(p.CipherSuites))
copy(hello.CipherSuites, p.CipherSuites)
for i := range hello.CipherSuites {
if hello.CipherSuites[i] == GREASE_PLACEHOLDER {
if isGREASEUint16(hello.CipherSuites[i]) {
hello.CipherSuites[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_cipher)
}
}
@ -2025,7 +2025,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
}
case *SupportedCurvesExtension:
for i := range ext.Curves {
if ext.Curves[i] == GREASE_PLACEHOLDER {
if isGREASEUint16(uint16(ext.Curves[i])) {
ext.Curves[i] = CurveID(GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_group))
}
}
@ -2033,7 +2033,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
preferredCurveIsSet := false
for i := range ext.KeyShares {
curveID := ext.KeyShares[i].Group
if curveID == GREASE_PLACEHOLDER {
if isGREASEUint16(uint16(curveID)) {
ext.KeyShares[i].Group = CurveID(GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_group))
continue
}
@ -2055,7 +2055,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
}
case *SupportedVersionsExtension:
for i := range ext.Versions {
if ext.Versions[i] == GREASE_PLACEHOLDER {
if isGREASEUint16(ext.Versions[i]) {
ext.Versions[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_version)
}
}