chore: use {go,oohttp,oocrypto} v1.18.5 (#872)
* 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 https://github.com/ooni/probe/issues/2222).
Closes https://github.com/ooni/probe/issues/2223.
* fix: use oocrypto@v0.1.1
This ensures we keep https://github.com/ooni/probe/issues/2122 fixed.
This commit is contained in:
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user