diff --git a/go.mod b/go.mod index 064c835..aabc611 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 github.com/montanaflynn/stats v0.6.6 github.com/ooni/go-libtor v1.1.5 - github.com/ooni/oocrypto v0.0.0-20220602060101-d4b099ec0ed9 github.com/ooni/oohttp v0.0.0-20220602055714-3d81a8b41c3a github.com/ooni/probe-assets v0.10.0 github.com/ooni/psiphon/tunnel-core v0.0.0-20220519122549-9c044eb6bd83 diff --git a/go.sum b/go.sum index 56d1ec6..40c3d0b 100644 --- a/go.sum +++ b/go.sum @@ -612,10 +612,6 @@ github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/ooni/go-libtor v1.1.5 h1:YbwXR9aLuL37EwL7rksPCQQhcHwoxU+M/v+jwZR+n5Y= github.com/ooni/go-libtor v1.1.5/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI= -github.com/ooni/oocrypto v0.0.0-20220602060101-d4b099ec0ed9 h1:8QeDRrt70iq5yhRQuYFzOrQuhZ5M77sk4oCYnCECw8g= -github.com/ooni/oocrypto v0.0.0-20220602060101-d4b099ec0ed9/go.mod h1:tP8tp455ERRdy38YWJQtQHb5LB6I5DvI4ffrnouypnM= -github.com/ooni/oohttp v0.0.0-20220522094856-8e922fd76ace h1:2v8zIwsJ+espVqiKIq6BzcP5OPPX5Rk/ZmcgZmz+9gU= -github.com/ooni/oohttp v0.0.0-20220522094856-8e922fd76ace/go.mod h1:p2VVLbs+BXBIgTHITV9Vw8Rv6G1u66JUWP/8KCgDGNo= github.com/ooni/oohttp v0.0.0-20220602055714-3d81a8b41c3a h1:2BH9AplJ7meOhtzfMiTvsClYQ9+qjk3Z2mw8cRUPYqE= github.com/ooni/oohttp v0.0.0-20220602055714-3d81a8b41c3a/go.mod h1:p2VVLbs+BXBIgTHITV9Vw8Rv6G1u66JUWP/8KCgDGNo= github.com/ooni/probe-assets v0.10.0 h1:FSk5nNPEFfRhglJDjtFHlZCHE+0eERcW5R+Ujs425Tk= diff --git a/internal/netxlite/tls.go b/internal/netxlite/tls.go index eceb8b1..9a3dd97 100644 --- a/internal/netxlite/tls.go +++ b/internal/netxlite/tls.go @@ -13,7 +13,6 @@ import ( "net" "time" - ootls "github.com/ooni/oocrypto/tls" oohttp "github.com/ooni/oohttp" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" @@ -206,7 +205,14 @@ func (h *tlsHandshakerConfigurable) newConn(conn net.Conn, config *tls.Config) ( if h.NewConn != nil { return h.NewConn(conn, config) } - return ootls.NewClientConnStdlib(conn, config) + // This used to be the place where we created a TLSConn using + // github.com/ooni/oocrypto's TLS. However, it seems this strategy + // does not correctly pick up the CPU capabilities. So, we have + // now disabled oocrypto until we investigate, to avoid making the + // development branch worse than it could in terms of TLS fingerprint. + // + // TODO(https://github.com/ooni/probe/issues/2122) + return tls.Client(conn, config), nil } // defaultTLSHandshaker is the default TLS handshaker. diff --git a/mk b/mk index c3cd5cf..60ed290 100755 --- a/mk +++ b/mk @@ -301,6 +301,8 @@ GOMOBILE = $(shell go env GOPATH)/bin/gomobile #help: * `./mk ./MOBILE/android/oonimkall.aar`: the AAR .PHONY: ./MOBILE/android/oonimkall.aar ./MOBILE/android/oonimkall.aar: android/sdk maybe/copypsiphon + @echo "Android build disabled - TODO(https://github.com/ooni/probe/issues/2122)" + @exit 1 go get -u golang.org/x/mobile/cmd/gomobile $(GOMOBILE) init PATH=$(shell go env GOPATH)/bin:$$PATH ANDROID_HOME=$(OONI_ANDROID_HOME) ANDROID_NDK_HOME=$(OONI_ANDROID_HOME)/ndk/$(ANDROID_NDK_VERSION) $(GOMOBILE) bind -x -target android -o ./MOBILE/android/oonimkall.aar -tags="$(OONI_PSIPHON_TAGS)" -ldflags '-s -w' $(GOLANG_EXTRA_FLAGS) ./pkg/oonimkall