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

feat: Properly check GREASE

Browse source 
Adopted from #148.

Co-Authored-By: gfw-report <gfw.report@protonmail.com>
This commit is contained in:
Gaukas Wang 2023-03-03 22:18:17 -07:00
parent 16aa278a66
commit c3e9de17af
No known key found for this signature in database
GPG key ID: 9E2F8986D76F8B5D
2 changed files with 5 additions and 5 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) minVers := uint16(0)
maxVers := uint16(0) maxVers := uint16(0)
for _, vers := range versions { for _, vers := range versions {
if vers == GREASE_PLACEHOLDER { if isGREASEUint16(vers) {
continue continue
} }
if maxVers < vers || maxVers == 0 { if maxVers < vers || maxVers == 0 {

8
u_parrots.go
View file

@ -1984,7 +1984,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
hello.CipherSuites = make([]uint16, len(p.CipherSuites)) hello.CipherSuites = make([]uint16, len(p.CipherSuites))
copy(hello.CipherSuites, p.CipherSuites) copy(hello.CipherSuites, p.CipherSuites)
for i := range hello.CipherSuites { for i := range hello.CipherSuites {
if hello.CipherSuites[i] == GREASE_PLACEHOLDER { if isGREASEUint16(hello.CipherSuites[i]) { // just in case the user set a GREASE value instead of unGREASEd
hello.CipherSuites[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_cipher) hello.CipherSuites[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_cipher)
} }
} }
@ -2025,7 +2025,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
} }
case *SupportedCurvesExtension: case *SupportedCurvesExtension:
for i := range ext.Curves { 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)) ext.Curves[i] = CurveID(GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_group))
} }
} }
@ -2033,7 +2033,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
preferredCurveIsSet := false preferredCurveIsSet := false
for i := range ext.KeyShares { for i := range ext.KeyShares {
curveID := ext.KeyShares[i].Group curveID := ext.KeyShares[i].Group
if curveID == GREASE_PLACEHOLDER { if isGREASEUint16(uint16(curveID)) { // just in case the user set a GREASE value instead of unGREASEd
ext.KeyShares[i].Group = CurveID(GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_group)) ext.KeyShares[i].Group = CurveID(GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_group))
continue continue
} }
@ -2055,7 +2055,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
} }
case *SupportedVersionsExtension: case *SupportedVersionsExtension:
for i := range ext.Versions { for i := range ext.Versions {
if ext.Versions[i] == GREASE_PLACEHOLDER { if isGREASEUint16(ext.Versions[i]) { // just in case the user set a GREASE value instead of unGREASEd
ext.Versions[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_version) ext.Versions[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_version)
} }
} }