From c3e9de17af8dbf7767ce0746c2bcba14dd253586 Mon Sep 17 00:00:00 2001 From: Gaukas Wang Date: Fri, 3 Mar 2023 22:18:17 -0700 Subject: [PATCH] feat: Properly check GREASE Adopted from #148. Co-Authored-By: gfw-report --- u_conn.go | 2 +- u_parrots.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/u_conn.go b/u_conn.go index bf3e053..0ed18f3 100644 --- a/u_conn.go +++ b/u_conn.go @@ -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 { diff --git a/u_parrots.go b/u_parrots.go index 7fab021..3a26cd0 100644 --- a/u_parrots.go +++ b/u_parrots.go @@ -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]) { // just in case the user set a GREASE value instead of unGREASEd 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)) { // just in case the user set a GREASE value instead of unGREASEd 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]) { // just in case the user set a GREASE value instead of unGREASEd ext.Versions[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_version) } }