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

Fix statefulness

Browse source
This commit is contained in:
Sergey Frolov 2018-07-28 18:39:50 -04:00 • committed by sergeyfrolov
parent 03d875d854
commit 2551de140c
3 changed files with 161 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

5
u_common.go
View file

@ -127,8 +127,6 @@ func utlsMacSHA384(version uint16, key []byte) macFunction {
var utlsSupportedCipherSuites []*cipherSuite var utlsSupportedCipherSuites []*cipherSuite
var utlsIdToSpec map[ClientHelloID]ClientHelloSpec
func init() { func init() {
utlsSupportedCipherSuites = append(cipherSuites, []*cipherSuite{ utlsSupportedCipherSuites = append(cipherSuites, []*cipherSuite{
{OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12, ecdheRSAKA, {OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12, ecdheRSAKA,
@ -136,9 +134,6 @@ func init() {
{OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12, ecdheECDSAKA, {OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12, ecdheECDSAKA,
suiteECDHE | suiteECDSA | suiteTLS12 | suiteDefaultOff, nil, nil, aeadChaCha20Poly1305}, suiteECDHE | suiteECDSA | suiteTLS12 | suiteDefaultOff, nil, nil, aeadChaCha20Poly1305},
}...) }...)
utlsIdToSpec = make(map[ClientHelloID]ClientHelloSpec)
initParrots()
} }
// EnableWeakCiphers allows utls connections to continue in some cases, when weak cipher was chosen. // EnableWeakCiphers allows utls connections to continue in some cases, when weak cipher was chosen.

1
u_conn.go
View file

@ -65,6 +65,7 @@ func (uconn *UConn) BuildHandshakeState() error {
if err != nil { if err != nil {
return err return err
} }
err = uconn.ApplyConfig() err = uconn.ApplyConfig()
if err != nil { if err != nil {
return err return err

317
u_parrots.go
View file

@ -16,159 +16,161 @@ import (
"time" "time"
) )
func initParrots() { func utlsIdToSpec(id ClientHelloID) (ClientHelloSpec, error) {
// TODO: auto switch id {
utlsIdToSpec[HelloChrome_58] = ClientHelloSpec{ case HelloChrome_58, HelloChrome_62:
CipherSuites: []uint16{ return ClientHelloSpec{
GREASE_PLACEHOLDER, CipherSuites: []uint16{
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, GREASE_PLACEHOLDER,
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
TLS_RSA_WITH_AES_256_GCM_SHA384, TLS_RSA_WITH_AES_128_GCM_SHA256,
TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_256_GCM_SHA384,
TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA,
TLS_RSA_WITH_3DES_EDE_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA,
}, TLS_RSA_WITH_3DES_EDE_CBC_SHA,
CompressionMethods: []byte{compressionNone},
Extensions: []TLSExtension{
&UtlsGREASEExtension{},
&RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient},
&SNIExtension{},
&UtlsExtendedMasterSecretExtension{},
&SessionTicketExtension{},
&SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []SignatureScheme{
ECDSAWithP256AndSHA256,
PSSWithSHA256,
PKCS1WithSHA256,
ECDSAWithP384AndSHA384,
PSSWithSHA384,
PKCS1WithSHA384,
PSSWithSHA512,
PKCS1WithSHA512,
PKCS1WithSHA1},
}, },
&StatusRequestExtension{}, CompressionMethods: []byte{compressionNone},
&SCTExtension{}, Extensions: []TLSExtension{
&ALPNExtension{AlpnProtocols: []string{"h2", "http/1.1"}}, &UtlsGREASEExtension{},
&FakeChannelIDExtension{}, &RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient},
&SupportedPointsExtension{SupportedPoints: []byte{pointFormatUncompressed}}, &SNIExtension{},
&SupportedCurvesExtension{[]CurveID{CurveID(GREASE_PLACEHOLDER), &UtlsExtendedMasterSecretExtension{},
X25519, CurveP256, CurveP384}}, &SessionTicketExtension{},
&UtlsGREASEExtension{}, &SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []SignatureScheme{
&UtlsPaddingExtension{GetPaddingLen: BoringPaddingStyle}, ECDSAWithP256AndSHA256,
}, PSSWithSHA256,
GetSessionID: sha256.Sum256, PKCS1WithSHA256,
} ECDSAWithP384AndSHA384,
utlsIdToSpec[HelloChrome_62] = utlsIdToSpec[HelloChrome_58] PSSWithSHA384,
PKCS1WithSHA384,
utlsIdToSpec[HelloFirefox_55] = ClientHelloSpec{ PSSWithSHA512,
CipherSuites: []uint16{ PKCS1WithSHA512,
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, PKCS1WithSHA1},
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, },
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, &StatusRequestExtension{},
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, &SCTExtension{},
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, &ALPNExtension{AlpnProtocols: []string{"h2", "http/1.1"}},
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, &FakeChannelIDExtension{},
TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, &SupportedPointsExtension{SupportedPoints: []byte{pointFormatUncompressed}},
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, &SupportedCurvesExtension{[]CurveID{CurveID(GREASE_PLACEHOLDER),
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, X25519, CurveP256, CurveP384}},
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, &UtlsGREASEExtension{},
FAKE_TLS_DHE_RSA_WITH_AES_128_CBC_SHA, &UtlsPaddingExtension{GetPaddingLen: BoringPaddingStyle},
FAKE_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
TLS_RSA_WITH_AES_128_CBC_SHA,
TLS_RSA_WITH_AES_256_CBC_SHA,
TLS_RSA_WITH_3DES_EDE_CBC_SHA,
},
CompressionMethods: []byte{compressionNone},
Extensions: []TLSExtension{
&SNIExtension{},
&UtlsExtendedMasterSecretExtension{},
&RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient},
&SupportedCurvesExtension{[]CurveID{X25519, CurveP256, CurveP384, CurveP521}},
&SupportedPointsExtension{SupportedPoints: []byte{pointFormatUncompressed}},
&SessionTicketExtension{},
&ALPNExtension{AlpnProtocols: []string{"h2", "http/1.1"}},
&StatusRequestExtension{},
&SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []SignatureScheme{
ECDSAWithP256AndSHA256,
ECDSAWithP384AndSHA384,
ECDSAWithP521AndSHA512,
PSSWithSHA256,
PSSWithSHA384,
PSSWithSHA512,
PKCS1WithSHA256,
PKCS1WithSHA384,
PKCS1WithSHA512,
ECDSAWithSHA1,
PKCS1WithSHA1},
}, },
&UtlsPaddingExtension{GetPaddingLen: BoringPaddingStyle}, GetSessionID: sha256.Sum256,
}, }, nil
GetSessionID: nil, case HelloFirefox_55, HelloFirefox_56:
} return ClientHelloSpec{
utlsIdToSpec[HelloFirefox_56] = utlsIdToSpec[HelloFirefox_55] CipherSuites: []uint16{
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
utlsIdToSpec[HelloIOS_11_1] = ClientHelloSpec{ TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
CipherSuites: []uint16{ TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
DISABLED_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, FAKE_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, FAKE_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
DISABLED_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, TLS_RSA_WITH_AES_128_CBC_SHA,
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA,
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_3DES_EDE_CBC_SHA,
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, },
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, CompressionMethods: []byte{compressionNone},
TLS_RSA_WITH_AES_256_GCM_SHA384, Extensions: []TLSExtension{
TLS_RSA_WITH_AES_128_GCM_SHA256, &SNIExtension{},
DISABLED_TLS_RSA_WITH_AES_256_CBC_SHA256, &UtlsExtendedMasterSecretExtension{},
TLS_RSA_WITH_AES_128_CBC_SHA256, &RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient},
TLS_RSA_WITH_AES_256_CBC_SHA, &SupportedCurvesExtension{[]CurveID{X25519, CurveP256, CurveP384, CurveP521}},
TLS_RSA_WITH_AES_128_CBC_SHA, &SupportedPointsExtension{SupportedPoints: []byte{pointFormatUncompressed}},
}, &SessionTicketExtension{},
CompressionMethods: []byte{ &ALPNExtension{AlpnProtocols: []string{"h2", "http/1.1"}},
compressionNone, &StatusRequestExtension{},
}, &SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []SignatureScheme{
Extensions: []TLSExtension{ ECDSAWithP256AndSHA256,
&RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient}, ECDSAWithP384AndSHA384,
&SNIExtension{}, ECDSAWithP521AndSHA512,
&UtlsExtendedMasterSecretExtension{}, PSSWithSHA256,
&SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []SignatureScheme{ PSSWithSHA384,
ECDSAWithP256AndSHA256, PSSWithSHA512,
PSSWithSHA256, PKCS1WithSHA256,
PKCS1WithSHA256, PKCS1WithSHA384,
ECDSAWithP384AndSHA384, PKCS1WithSHA512,
PSSWithSHA384, ECDSAWithSHA1,
PKCS1WithSHA384, PKCS1WithSHA1},
PSSWithSHA512, },
PKCS1WithSHA512, &UtlsPaddingExtension{GetPaddingLen: BoringPaddingStyle},
PKCS1WithSHA1, },
}}, GetSessionID: nil,
&StatusRequestExtension{}, }, nil
&NPNExtension{}, case HelloIOS_11_1:
&SCTExtension{}, return ClientHelloSpec{
&ALPNExtension{AlpnProtocols: []string{"h2", "h2-16", "h2-15", "h2-14", "spdy/3.1", "spdy/3", "http/1.1"}}, CipherSuites: []uint16{
&SupportedPointsExtension{SupportedPoints: []byte{ TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
pointFormatUncompressed, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
}}, DISABLED_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
&SupportedCurvesExtension{Curves: []CurveID{ TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
X25519, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
CurveP256, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
CurveP384, TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
CurveP521, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
}}, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
}, DISABLED_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
TLS_RSA_WITH_AES_256_GCM_SHA384,
TLS_RSA_WITH_AES_128_GCM_SHA256,
DISABLED_TLS_RSA_WITH_AES_256_CBC_SHA256,
TLS_RSA_WITH_AES_128_CBC_SHA256,
TLS_RSA_WITH_AES_256_CBC_SHA,
TLS_RSA_WITH_AES_128_CBC_SHA,
},
CompressionMethods: []byte{
compressionNone,
},
Extensions: []TLSExtension{
&RenegotiationInfoExtension{renegotiation: RenegotiateOnceAsClient},
&SNIExtension{},
&UtlsExtendedMasterSecretExtension{},
&SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []SignatureScheme{
ECDSAWithP256AndSHA256,
PSSWithSHA256,
PKCS1WithSHA256,
ECDSAWithP384AndSHA384,
PSSWithSHA384,
PKCS1WithSHA384,
PSSWithSHA512,
PKCS1WithSHA512,
PKCS1WithSHA1,
}},
&StatusRequestExtension{},
&NPNExtension{},
&SCTExtension{},
&ALPNExtension{AlpnProtocols: []string{"h2", "h2-16", "h2-15", "h2-14", "spdy/3.1", "spdy/3", "http/1.1"}},
&SupportedPointsExtension{SupportedPoints: []byte{
pointFormatUncompressed,
}},
&SupportedCurvesExtension{Curves: []CurveID{
X25519,
CurveP256,
CurveP384,
CurveP521,
}},
},
}, nil
default:
return ClientHelloSpec{}, errors.New("ClientHello ID " + id.Str() + " is unknown")
} }
} }
@ -196,10 +198,9 @@ func (uconn *UConn) applyPresetByID(id ClientHelloID) (err error) {
return nil return nil
default: default:
var specFound bool spec, err = utlsIdToSpec(id)
spec, specFound = utlsIdToSpec[id] if err != nil {
if !specFound { return err
return errors.New("Unknown ClientHelloID: " + id.Str())
} }
} }
@ -250,7 +251,8 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
uconn.greaseSeed[ssl_grease_extension2] ^= 0x1010 uconn.greaseSeed[ssl_grease_extension2] ^= 0x1010
} }
hello.CipherSuites = p.CipherSuites hello.CipherSuites = make([]uint16, len(p.CipherSuites))
copy(hello.CipherSuites, p.CipherSuites)
for i := range hello.CipherSuites { for i := range hello.CipherSuites {
if hello.CipherSuites[i] == GREASE_PLACEHOLDER { if hello.CipherSuites[i] == GREASE_PLACEHOLDER {
hello.CipherSuites[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_cipher) hello.CipherSuites[i] = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_cipher)
@ -258,7 +260,8 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
} }
uconn.GetSessionID = p.GetSessionID uconn.GetSessionID = p.GetSessionID
uconn.Extensions = p.Extensions uconn.Extensions = make([]TLSExtension, len(p.Extensions))
copy(uconn.Extensions, p.Extensions)
for _, e := range uconn.Extensions { for _, e := range uconn.Extensions {
switch ext := e.(type) { switch ext := e.(type) {