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

Rename FakeGREASEExtension -> UtlsGREASEExtension

Browse source
This commit is contained in:
Sergey Frolov 2018-06-27 14:18:30 -04:00
parent 47f47cf66d
commit e0edd7863b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
u_parrots.go
View file

@ -37,7 +37,7 @@ func initParrots() {
}, },
CompressionMethods: []byte{compressionNone}, CompressionMethods: []byte{compressionNone},
Extensions: []TLSExtension{ Extensions: []TLSExtension{
&FakeGREASEExtension{}, &UtlsGREASEExtension{},
&RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient}, &RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient},
&SNIExtension{}, &SNIExtension{},
&UtlsExtendedMasterSecretExtension{}, &UtlsExtendedMasterSecretExtension{},
@ -60,7 +60,7 @@ func initParrots() {
&SupportedPointsExtension{SupportedPoints: []byte{pointFormatUncompressed}}, &SupportedPointsExtension{SupportedPoints: []byte{pointFormatUncompressed}},
&SupportedCurvesExtension{[]CurveID{CurveID(GREASE_PLACEHOLDER), &SupportedCurvesExtension{[]CurveID{CurveID(GREASE_PLACEHOLDER),
X25519, CurveP256, CurveP384}}, X25519, CurveP256, CurveP384}},
&FakeGREASEExtension{}, &UtlsGREASEExtension{},
&UtlsPaddingExtension{GetPaddingLen: BoringPaddingStyle}, &UtlsPaddingExtension{GetPaddingLen: BoringPaddingStyle},
}, },
GetSessionID: sha256.Sum256, GetSessionID: sha256.Sum256,
@ -209,7 +209,7 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
if ext.ServerName == "" { if ext.ServerName == "" {
ext.ServerName = uconn.config.ServerName ext.ServerName = uconn.config.ServerName
} }
case *FakeGREASEExtension: case *UtlsGREASEExtension:
switch grease_extensions_seen { switch grease_extensions_seen {
case 0: case 0:
ext.Value = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_extension1) ext.Value = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_extension1)

8
u_tls_extensions.go
View file

@ -455,12 +455,12 @@ const (
) )
// it is responsibility of user not to generate multiple grease extensions with same value // it is responsibility of user not to generate multiple grease extensions with same value
type FakeGREASEExtension struct { type UtlsGREASEExtension struct {
Value uint16 Value uint16
Body []byte // in Chrome first grease has empty body, second grease has a single zero byte Body []byte // in Chrome first grease has empty body, second grease has a single zero byte
} }
func (e *FakeGREASEExtension) writeToUConn(uc *UConn) error { func (e *UtlsGREASEExtension) writeToUConn(uc *UConn) error {
return nil return nil
} }
@ -475,11 +475,11 @@ func GetBoringGREASEValue(greaseSeed [ssl_grease_last_index]uint16, index int) u
return ret return ret
} }
func (e *FakeGREASEExtension) Len() int { func (e *UtlsGREASEExtension) Len() int {
return 4 + len(e.Body) return 4 + len(e.Body)
} }
func (e *FakeGREASEExtension) Read(b []byte) (int, error) { func (e *UtlsGREASEExtension) Read(b []byte) (int, error) {
if len(b) < e.Len() { if len(b) < e.Len() {
return 0, io.ErrShortBuffer return 0, io.ErrShortBuffer
} }