Merge branch 'harry/utls-import-fix' into harry/ossh

go.mod

@@ -50,7 +50,6 @@ require (
 	github.com/getlantern/tlsdefaults v0.0.0-20171004213447-cf35cfd0b1b4
 	github.com/getlantern/tlsmasq v0.4.2
 	github.com/getlantern/tlsredis v0.0.0-20180308045249-5d4ed6dd3836
-	github.com/getlantern/utls v0.0.0-20200903013459-0c02248f7ce1
 	github.com/getlantern/waitforserver v1.0.1
 	github.com/getlantern/withtimeout v0.0.0-20160829163843-511f017cd913
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
@@ -70,7 +69,7 @@ require (
 	github.com/mikioh/tcpopt v0.0.0-20180707144150-7178f18b4ea8 // indirect
 	github.com/mitchellh/panicwrap v1.0.0
 	github.com/prometheus/client_golang v1.9.0
-	github.com/refraction-networking/utls v0.0.0-20190415193640-32987941ebd3 // indirect
+	github.com/refraction-networking/utls v0.0.0-20190415193640-32987941ebd3
 	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
 	github.com/spaolacci/murmur3 v1.1.0
 	github.com/stretchr/testify v1.7.0
@@ -93,3 +92,5 @@ replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110
 
 // Waiting on https://github.com/mitchellh/panicwrap/pull/27 to be merged upstream
 replace github.com/mitchellh/panicwrap v1.0.0 => github.com/getlantern/panicwrap v0.0.0-20200707191944-9ba45baf8e51
+
+replace github.com/refraction-networking/utls => github.com/getlantern/utls v0.0.0-20200903013459-0c02248f7ce1

go.sum

@@ -748,8 +748,6 @@ github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3x
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/refraction-networking/utls v0.0.0-20190415193640-32987941ebd3 h1:s2Sc0GRY8eHp8AGUTvCiQuSfzgmlj0xvLBe/PPtVzLw=
-github.com/refraction-networking/utls v0.0.0-20190415193640-32987941ebd3/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0=
 github.com/retailnext/hllpp v1.0.0/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
 github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037/go.mod h1:F1p8BNM4IXv2UcptwSp8HJOapKurodd/PYu1D6Gtn9Y=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=

ossh/ossh_test.go

@@ -17,8 +17,6 @@ import (
 )
 
 func TestWrap(t *testing.T) {
-	// TODO: implement me!
-
 	keyword := "obfuscation-keyword"
 	_hostKey, err := rsa.GenerateKey(rand.Reader, 1024)
 	require.NoError(t, err)

tlslistener/clienthelloconn.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/getlantern/golog"
 	"github.com/getlantern/netx"
-	utls "github.com/getlantern/utls"
+	utls "github.com/refraction-networking/utls"
 
 	"github.com/getlantern/http-proxy-lantern/v2/instrument"
 )

tlslistener/clienthelloconn_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	utls "github.com/getlantern/utls"
+	utls "github.com/refraction-networking/utls"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/getlantern/http-proxy-lantern/v2/instrument"

tlslistener/tlslistener.go

@@ -9,7 +9,7 @@ import (
 	"github.com/getlantern/golog"
 	"github.com/getlantern/tlsdefaults"
 
-	utls "github.com/getlantern/utls"
+	utls "github.com/refraction-networking/utls"
 
 	"github.com/getlantern/http-proxy-lantern/v2/instrument"
 )