commit dba633c7dc0d7d919e8be1b61016cab7cfa8e60e Author: Yawning Angel yawning@schwanenlied.me Date: Sat Mar 30 11:02:11 2019 +0000

transports/meek_lite: More utls related changes

* Bump the module import to a new tag * Bump the rest of the dependencies while I'm here * Add some new fingerprints from upstream * Disable my fork's AES timing sidechannel defenses --- go.mod | 9 ++++----- go.sum | 32 ++++++++++++++++++++------------ transports/meeklite/transport.go | 11 +++++++---- 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/go.mod b/go.mod index 422ac26..d10c42b 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,10 @@ module gitlab.com/yawning/obfs4.git

require ( - git.torproject.org/pluggable-transports/goptlib.git v0.0.0-20190117054722-15f83653abbc + git.torproject.org/pluggable-transports/goptlib.git v1.0.0 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 github.com/dchest/siphash v1.2.1 - gitlab.com/yawning/utls.git v0.0.9-2 - golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 - golang.org/x/net v0.0.0-20190119204137-ed066c81e75e - golang.org/x/text v0.3.0 // indirect + gitlab.com/yawning/utls.git v0.0.10-1 + golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c + golang.org/x/net v0.0.0-20190328230028-74de082e2cca ) diff --git a/go.sum b/go.sum index 03020e0..210aed5 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,26 @@ -git.torproject.org/pluggable-transports/goptlib.git v0.0.0-20190117054722-15f83653abbc h1:k14lBVrBVgZx22Eg5eqQshT12PAsXBfAJK3vm65D/YE= -git.torproject.org/pluggable-transports/goptlib.git v0.0.0-20190117054722-15f83653abbc/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q= +git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 h1:zOrl5/RvK48MxMrif6Z+/OpuYyRnvB+ZTrQWEV9VYb0= +git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod h1:BWqTsj8PgcPriQJGl7el20J/7TuT1d/hSyFDXMEpoEo= +git.torproject.org/pluggable-transports/goptlib.git v1.0.0 h1:ElTwFFPKf/tA6x5nuIk9g49JZzS4T5WN+eTQTjqd00A= +git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= -github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac= -github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s= -gitlab.com/yawning/utls.git v0.0.9-2 h1:Eluu5djPH7CKcmGX14AX28eqKgHrBSQIc1RCAUROxVQ= -gitlab.com/yawning/utls.git v0.0.9-2/go.mod h1:PuJDGdGVFPpgc2evhLjHRgl5ZN2sItpDiydweKFYtuc= -golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc= -golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q= -golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sys v0.0.0-20190201152629-afcc84fd7533 h1:bLfqnzrpeG4usq5OvMCrwTdmMJ6aTmlCuo1eKl0mhkI= -golang.org/x/sys v0.0.0-20190201152629-afcc84fd7533/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= +github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= +github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= +github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +gitlab.com/yawning/utls.git v0.0.10-1 h1:R6W4OfI8B87cxASe7GLGIFwqcjPzM1PQCN+VHPaqrZQ= +gitlab.com/yawning/utls.git v0.0.10-1/go.mod h1:eYdrOOCoedNc3xw50kJ/s8JquyxeS5kr3vkFZFPTI9w= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20190328230028-74de082e2cca h1:hyA6yiAgbUwuWqtscNvWAI7U1CtlaD1KilQ6iudt1aI= +golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65 h1:hOY+O8MxdkPV10pNf7/XEHaySCiPKxixMKUshfHsGn0= +golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/transports/meeklite/transport.go b/transports/meeklite/transport.go index 8ea865f..4e4907a 100644 --- a/transports/meeklite/transport.go +++ b/transports/meeklite/transport.go @@ -48,13 +48,15 @@ var ( "hellofirefox_55": &utls.HelloFirefox_55, "hellofirefox_56": &utls.HelloFirefox_56, "hellofirefox_63": &utls.HelloFirefox_63, + "hellofirefix_65": &utls.HelloFirefox_65, "hellochrome_auto": &utls.HelloChrome_Auto, "hellochrome_58": &utls.HelloChrome_58, "hellochrome_62": &utls.HelloChrome_62, "hellochrome_70": &utls.HelloChrome_70, - "hellochrome_71": &utls.HelloChrome_71, + "hellochrome_72": &utls.HelloChrome_72, "helloios_auto": &utls.HelloIOS_Auto, "helloios_11_1": &utls.HelloIOS_11_1, + "helloios_12_1": &utls.HelloIOS_12_1, } defaultClientHello = &utls.HelloFirefox_Auto ) @@ -238,9 +240,10 @@ func newHTTPTransport(dialFn, dialTLSFn base.DialFunc) *http.Transport { }

func init() { - // Attempt to increase compatibility, there's an encrypted link - // underneath, and this doesn't (shouldn't) affect the external - // fingerprint. + // Attempt to increase compatibility and performance, there's an + // encrypted link underneath, and this doesn't (shouldn't) affect + // the external fingerprint. utls.EnableWeakCiphers() utls.EnableVartimeGroups() + utls.EnableVartimeAES() }