diff --git a/.github/workflows/alltests.yml b/.github/workflows/alltests.yml index 7d17989..a0bd56d 100644 --- a/.github/workflows/alltests.yml +++ b/.github/workflows/alltests.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: go test -race -tags shaping ./... diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 86e3d4c..4cd723e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5d4b8ba..b627108 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - go: [ "1.17.4" ] + go: [ "1.17.6" ] steps: - uses: actions/setup-go@v1 with: diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 493da6a..5fa51e2 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: go generate ./... diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index dfedc61..91502ce 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/jafar.yml b/.github/workflows/jafar.yml index ac4591c..7ad693e 100644 --- a/.github/workflows/jafar.yml +++ b/.github/workflows/jafar.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: go build -v ./internal/cmd/jafar - run: sudo ./testjafar.bash diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8cd7f52..ebe8fa6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/miniooni.yml b/.github/workflows/miniooni.yml index 15964b5..765cbe2 100644 --- a/.github/workflows/miniooni.yml +++ b/.github/workflows/miniooni.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 with: diff --git a/.github/workflows/netxlite.yml b/.github/workflows/netxlite.yml index 417eae6..500fce6 100644 --- a/.github/workflows/netxlite.yml +++ b/.github/workflows/netxlite.yml @@ -10,7 +10,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - go: [ "1.17.4" ] + go: [ "1.17.6" ] os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ] steps: - uses: actions/setup-go@v1 diff --git a/.github/workflows/oohelperd.yml b/.github/workflows/oohelperd.yml index 8e0e673..254f1a3 100644 --- a/.github/workflows/oohelperd.yml +++ b/.github/workflows/oohelperd.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - name: build oohelperd binary run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o ./CLI/oohelperd-linux-amd64 -v -tags netgo -ldflags="-s -w -extldflags -static" ./internal/cmd/oohelperd diff --git a/.github/workflows/qafbmessenger.yml b/.github/workflows/qafbmessenger.yml index fcce161..c549d59 100644 --- a/.github/workflows/qafbmessenger.yml +++ b/.github/workflows/qafbmessenger.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "fbmessenger" diff --git a/.github/workflows/qahhfm.yml b/.github/workflows/qahhfm.yml index 62cca83..88edb0e 100644 --- a/.github/workflows/qahhfm.yml +++ b/.github/workflows/qahhfm.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "hhfm" diff --git a/.github/workflows/qahirl.yml b/.github/workflows/qahirl.yml index 8c4ab06..9fa25a0 100644 --- a/.github/workflows/qahirl.yml +++ b/.github/workflows/qahirl.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "hirl" diff --git a/.github/workflows/qatelegram.yml b/.github/workflows/qatelegram.yml index e4229c9..42e1eae 100644 --- a/.github/workflows/qatelegram.yml +++ b/.github/workflows/qatelegram.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "telegram" diff --git a/.github/workflows/qawebconnectivity.yml b/.github/workflows/qawebconnectivity.yml index e08c354..925009b 100644 --- a/.github/workflows/qawebconnectivity.yml +++ b/.github/workflows/qawebconnectivity.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "webconnectivity" diff --git a/.github/workflows/qawhatsapp.yml b/.github/workflows/qawhatsapp.yml index a701839..c30115a 100644 --- a/.github/workflows/qawhatsapp.yml +++ b/.github/workflows/qawhatsapp.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "whatsapp" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4efca5f..196e22d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.4" + go-version: "1.17.6" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/go.mod b/go.mod index 83855d8..7907027 100644 --- a/go.mod +++ b/go.mod @@ -25,6 +25,7 @@ require ( github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/klauspost/reedsolomon v1.9.15 // indirect github.com/lucas-clemente/quic-go v0.24.0 + github.com/marten-seemann/qtls-go1-17 v0.1.0 github.com/mattn/go-colorable v0.1.12 github.com/mattn/go-sqlite3 v1.14.9 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect @@ -33,7 +34,7 @@ require ( github.com/montanaflynn/stats v0.6.6 github.com/onsi/ginkgo v1.16.5 // indirect github.com/ooni/go-libtor v1.1.4 - github.com/ooni/oohttp v0.0.0-20211206150145-a14131163a5e + github.com/ooni/oohttp v0.0.0-20220118112935-940b7f7db71e github.com/ooni/probe-assets v0.6.0 github.com/ooni/psiphon v0.9.0 github.com/oschwald/geoip2-golang v1.5.0 @@ -51,7 +52,7 @@ require ( gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b gitlab.com/yawning/utls.git v0.0.12-1 golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect - golang.org/x/net v0.0.0-20211205041911-012df41ee64c + golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d golang.org/x/sys v0.0.0-20211205182925-97ca703d548d golang.org/x/tools v0.1.8 // indirect gopkg.in/AlecAivazis/survey.v1 v1.8.8 diff --git a/go.sum b/go.sum index 6df2c7c..c327371 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/ooni/go-libtor v1.1.4 h1:awp/ZUTO4sI85ufR5/GNmZ4YK41lNlWpjeKJkpBQ41Q= github.com/ooni/go-libtor v1.1.4/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI= -github.com/ooni/oohttp v0.0.0-20211206150145-a14131163a5e h1:hGKGXauBg3FpVw+gwUsGTNAwDz/TwSJL7eobvzDKnYs= -github.com/ooni/oohttp v0.0.0-20211206150145-a14131163a5e/go.mod h1:IhQrrBqPX6/Pb8mGKdw3wskNOk5r8ngqmqAXrH3j7vw= +github.com/ooni/oohttp v0.0.0-20220118112935-940b7f7db71e h1:mhYIPP/XEfH/xXanrj2QkITvX2M8ygYohCYZ4ux/f6M= +github.com/ooni/oohttp v0.0.0-20220118112935-940b7f7db71e/go.mod h1:0ovaZJvw5mVOqr0G3l2JDhJRS0KpgzHFAdZXE1MTVRw= github.com/ooni/probe-assets v0.6.0 h1:ZL1CTO1Z3CBYieVG6wuwXHLoeZmmFUR2AhtZlBFctTk= github.com/ooni/probe-assets v0.6.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo= github.com/ooni/psiphon v0.9.0 h1:THWP09pYSKzoq9RIKZWuz9367ho9bri9lKxkMu8VsM8= @@ -775,8 +775,8 @@ golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211205041911-012df41ee64c h1:7SfqwP5fxEtl/P02w5IhKc86ziJ+A25yFrkVgoy2FT8= -golang.org/x/net v0.0.0-20211205041911-012df41ee64c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= diff --git a/mk b/mk index f55ba32..7d04392 100755 --- a/mk +++ b/mk @@ -64,7 +64,7 @@ GOLANG_EXTRA_FLAGS = #help: #help: * GOLANG_VERSION_NUMBER : the expected version number for golang. -GOLANG_VERSION_NUMBER = 1.17.4 +GOLANG_VERSION_NUMBER = 1.17.6 #help: #help: * MINGW_W64_VERSION : the expected mingw-w64 version. @@ -72,7 +72,7 @@ MINGW_W64_VERSION = 10.3.1 #help: #help: * OONIGO_BRANCH : the github.com/ooni/go branch to use. -OONIGO_BRANCH = oonigo1.17 +OONIGO_BRANCH = oonigo1.17.6 #help: #help: * OONI_PSIPHON_TAGS : build tags for `go build -tags ...` that cause