Skip to content

Commit

Permalink
chore: use {go,oohttp,oocrypto} v1.18.5 (#872)
Browse files Browse the repository at this point in the history
* chore: use {go,oohttp,oocrypto} v1.18.5

This diff pins OONI to use go1.18.5 and oohttp and oocrypto at
go1.18.5 as the version of go with which we build releases.

The same codebase also works with go1.19 although this configuration
cannot include Psiphon (see ooni/probe#2222).

Closes ooni/probe#2223.

* fix: use oocrypto@v0.1.1

This ensures we keep ooni/probe#2122 fixed.
  • Loading branch information
bassosimone committed Aug 22, 2022
1 parent 208ffa2 commit fe6d378
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion GOVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18.3
1.18.5
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ 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.2.1
github.com/ooni/oohttp v0.3.0
github.com/ooni/oocrypto v0.1.1
github.com/ooni/oohttp v0.2.1
github.com/ooni/probe-assets v0.11.0
github.com/ooni/psiphon/tunnel-core v0.0.0-20220819091114-7dccc0b6b6cd
github.com/oschwald/geoip2-golang v1.8.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,10 @@ 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.2.1 h1:jCx/s8SlZ81r6ECXkA8kiiz64D5q8CelcyQyKyl8sk8=
github.com/ooni/oocrypto v0.2.1/go.mod h1:NwhJ7wswn0Tlbc5Md2EIGZvvhTUE2CDUuNJM9jkbIFc=
github.com/ooni/oohttp v0.3.0 h1:75OsZKelkLXl6p2UD53dTJyIv+9owWqaL6sMT26LN8w=
github.com/ooni/oohttp v0.3.0/go.mod h1:fgNDPYw+nsgEKCDBpT/4R06bgnrCRtvgNmAWOCmm4JE=
github.com/ooni/oocrypto v0.1.1 h1:zYU9fxEGNHAd73gB8aRfbvvvAzdqRe/EXVlY64cMn7c=
github.com/ooni/oocrypto v0.1.1/go.mod h1:tP8tp455ERRdy38YWJQtQHb5LB6I5DvI4ffrnouypnM=
github.com/ooni/oohttp v0.2.1 h1:MGvRAXJdLFNqKeS5HXynIt8y7JIknmdTwC7DRpzDBko=
github.com/ooni/oohttp v0.2.1/go.mod h1:fgNDPYw+nsgEKCDBpT/4R06bgnrCRtvgNmAWOCmm4JE=
github.com/ooni/probe-assets v0.11.0 h1:IM2d455Zeiu1bb115aYdO+Aj35fgPTTmh2q3F7a5JnI=
github.com/ooni/probe-assets v0.11.0/go.mod h1:gI9d0ZNBkMsNgK5Me3m3K+QqWzFwHKP7KGZgyCB7IH4=
github.com/ooni/psiphon/tunnel-core v0.0.0-20220819091114-7dccc0b6b6cd h1:zKGpY8HLA6dSStqV8df1BzfUz2lZ9Yh9XeokLhAOHls=
Expand Down
29 changes: 17 additions & 12 deletions internal/netxlite/utls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"time"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/model/mocks"
utls "gitlab.com/yawning/utls.git"
)

Expand Down Expand Up @@ -94,17 +93,23 @@ func TestUTLSConn(t *testing.T) {
})
})

t.Run("NetConn", func(t *testing.T) {
factory := newConnUTLS(&utls.HelloChrome_70)
conn := &mocks.Conn{}
tconn, err := factory(conn, &tls.Config{})
if err != nil {
t.Fatal(err)
}
if tconn.NetConn() != conn {
t.Fatal("NetConn is not WAI")
}
})
// TODO(https://github.com/ooni/probe/issues/2222): we cannot enable
// this test until we use oocrypto >= v0.2 which uses go1.19. In turn,
// we cannot use go1.19 as our main version until we upgrade psiphon
// such that it builds using go1.19, which is the issue in #2222.
/*
t.Run("NetConn", func(t *testing.T) {
factory := newConnUTLS(&utls.HelloChrome_70)
conn := &mocks.Conn{}
tconn, err := factory(conn, &tls.Config{})
if err != nil {
t.Fatal(err)
}
if tconn.NetConn() != conn {
t.Fatal("NetConn is not WAI")
}
})
*/
}

func Test_newConnUTLSWithHelloID(t *testing.T) {
Expand Down

0 comments on commit fe6d378

Please sign in to comment.