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

Finish Firefox 55 fignerprint. Implements #4

Browse source
This commit is contained in:
Sergey Frolov 2017-08-15 12:50:40 -04:00
parent 0af497570e
commit 6890f3e435
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
u_common.go
View file

@ -91,7 +91,7 @@ var (
// The rest will will parrot given browser. // The rest will will parrot given browser.
HelloFirefox_Auto ClientHelloID = ClientHelloID{helloFirefox, helloAutoVers} HelloFirefox_Auto ClientHelloID = ClientHelloID{helloFirefox, helloAutoVers}
HelloFirefox_53_WIP = ClientHelloID{helloFirefox, 53} HelloFirefox_55 = ClientHelloID{helloFirefox, 55}
HelloChrome_Auto ClientHelloID = ClientHelloID{helloChrome, helloAutoVers} HelloChrome_Auto ClientHelloID = ClientHelloID{helloChrome, helloAutoVers}
HelloChrome_58 ClientHelloID = ClientHelloID{helloChrome, 58} HelloChrome_58 ClientHelloID = ClientHelloID{helloChrome, 58}

15
u_parrots.go
View file

@ -18,8 +18,8 @@ import (
func (uconn *UConn) generateClientHelloConfig(id ClientHelloID) error { func (uconn *UConn) generateClientHelloConfig(id ClientHelloID) error {
uconn.clientHelloID = id uconn.clientHelloID = id
switch uconn.clientHelloID { switch uconn.clientHelloID {
case HelloFirefox_53_WIP: case HelloFirefox_55:
return uconn.parrotFirefox_53_WIP() return uconn.parrotFirefox_55()
case HelloAndroid_6_0_Browser: case HelloAndroid_6_0_Browser:
return uconn.parrotAndroid_6_0() return uconn.parrotAndroid_6_0()
@ -47,7 +47,7 @@ func (uconn *UConn) generateClientHelloConfig(id ClientHelloID) error {
case HelloAndroid_Auto: case HelloAndroid_Auto:
return uconn.generateClientHelloConfig(HelloAndroid_6_0_Browser) return uconn.generateClientHelloConfig(HelloAndroid_6_0_Browser)
case HelloFirefox_Auto: case HelloFirefox_Auto:
return uconn.generateClientHelloConfig(HelloFirefox_53_WIP) return uconn.generateClientHelloConfig(HelloFirefox_55)
case HelloChrome_Auto: case HelloChrome_Auto:
return uconn.generateClientHelloConfig(HelloChrome_58) return uconn.generateClientHelloConfig(HelloChrome_58)
@ -85,12 +85,7 @@ func (uconn *UConn) fillClientHelloHeader() error {
return nil return nil
} }
func (uconn *UConn) parrotFirefox_53_WIP() error { func (uconn *UConn) parrotFirefox_55() error {
/*
Work in progress!
TODO: double check session id generation
TODO: add firefox-style padding
*/
hello := uconn.HandshakeState.Hello hello := uconn.HandshakeState.Hello
session := uconn.HandshakeState.Session session := uconn.HandshakeState.Session
hello.CipherSuites = []uint16{ hello.CipherSuites = []uint16{
@ -146,6 +141,7 @@ func (uconn *UConn) parrotFirefox_53_WIP() error {
{hashSHA1, signatureECDSA}, {hashSHA1, signatureECDSA},
{hashSHA1, signatureRSA}}, {hashSHA1, signatureRSA}},
} }
padding := FakePaddingExtension{GetPaddingLen: boringPaddingStyle}
uconn.Extensions = []TLSExtension{ uconn.Extensions = []TLSExtension{
&sni, &sni,
&ems, &ems,
@ -156,6 +152,7 @@ func (uconn *UConn) parrotFirefox_53_WIP() error {
&alpn, &alpn,
&status, &status,
&sigAndHash, &sigAndHash,
&padding,
} }
return nil return nil
} }