Skip to content

Commit abd576f

Browse files
authored
feat: enable psiphon for go1.24 (#1736)
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: #1727 - [ ] if you changed anything related to how experiments work and you need to reflect these changes in the ooni/spec repository, please link to the related ooni/spec pull request: <!-- add URL here --> - [ ] if you changed code inside an experiment, make sure you bump its version number <!-- Reminder: Location of the issue tracker: https://github.com/ooni/probe --> ## Description This diff enables psiphon for go1.24
1 parent 4c5d2e7 commit abd576f

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect
6363
github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378 // indirect
6464
github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1 // indirect
65-
github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa // indirect
65+
github.com/Psiphon-Labs/utls v0.0.0-20250623193530-396869e9cd87 // indirect
6666
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
6767
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
6868
github.com/andybalholm/brotli v1.1.1 // indirect

go.sum

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250721134743-defb3bae9d3
4343
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250721134743-defb3bae9d3d/go.mod h1:aWy3Mi+NQl4sflSYFwCt67T5+VGa8oADluYy64N77fs=
4444
github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1 h1:zD7JvZCV8gjvtI0AZmE81Ffc/v7A+qwU1/YfUmN/Flk=
4545
github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1/go.mod h1:rONdWgPMbFjyyBai7gB1IBF4pT9r4l0GyiDst5XR1SY=
46-
github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa h1:5FszHIhxb7yO267qt47tTfJOtD31k7R80L88EwNm4tc=
47-
github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa/go.mod h1:dxmztdV9lf59cq44YY8r21m3b+xSjhg98cgZW8WK1p0=
46+
github.com/Psiphon-Labs/utls v0.0.0-20250623193530-396869e9cd87 h1:h/OnQpPMwC7pKN9YQTJ+vQATjchta6kgumJNnkJBq1k=
47+
github.com/Psiphon-Labs/utls v0.0.0-20250623193530-396869e9cd87/go.mod h1:1vv0gVAzq9e2XYkW8HAKrmtuuZrBdDixQFx5H22KAjI=
4848
github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
4949
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
5050
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
@@ -401,18 +401,6 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
401401
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
402402
github.com/ooni/minivpn v0.0.7 h1:fRL6lOivKM+Q23HcN/FFiBftbKTAtz7U8r6cOypBAeM=
403403
github.com/ooni/minivpn v0.0.7/go.mod h1:0KNwmK2Wg9lDbk936XjtxvCq4tPNbK4C3IJvyLwIMrE=
404-
github.com/ooni/netem v0.0.0-20250905111507-061c5671b52a h1:hMOvvn2n1wGsvr5Yu08AD3k5B0sIjvFXf0WKbVaF2q0=
405-
github.com/ooni/netem v0.0.0-20250905111507-061c5671b52a/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
406-
github.com/ooni/netem v0.0.0-20250905204826-c5a98f0adaf3 h1:f7OF5eW6RjlGPhdboC7MkuwVgCTw7TQ693WURsoifS8=
407-
github.com/ooni/netem v0.0.0-20250905204826-c5a98f0adaf3/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
408-
github.com/ooni/netem v0.0.0-20250905205442-50412be8e1d6 h1:VX1JoiyYaxkoYYvdAS9lzbYJrefarANYp9HI0xya2qA=
409-
github.com/ooni/netem v0.0.0-20250905205442-50412be8e1d6/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
410-
github.com/ooni/netem v0.0.0-20250905210214-85788e175bc8 h1:XIctMrKUBGKWKIKq8Sa3KgR4HS8+QDpLxG4bFBBkNa8=
411-
github.com/ooni/netem v0.0.0-20250905210214-85788e175bc8/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
412-
github.com/ooni/netem v0.0.0-20250905210801-53f676ee63cc h1:UGE4Yvqlle3UNej9UJQRzeyjs9LUU3aYZVhkZvV8Lmo=
413-
github.com/ooni/netem v0.0.0-20250905210801-53f676ee63cc/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
414-
github.com/ooni/netem v0.0.0-20250905212331-da90fd1d7b06 h1:cJTcydHU8PbZQ4cYPo2ITWE6BSKgGnhCtZZWQdYCVfU=
415-
github.com/ooni/netem v0.0.0-20250905212331-da90fd1d7b06/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
416404
github.com/ooni/netem v0.0.0-20250905215919-3882eda4fb66 h1:i2sw2lTJKT4dbeTNW8GD+bKT8CFLdjZT6sLxWlKZbrw=
417405
github.com/ooni/netem v0.0.0-20250905215919-3882eda4fb66/go.mod h1:CKKtaYpxFRzD2I0Cxlkz9msGyc6p/ZkOLu6TfXneDyU=
418406
github.com/ooni/probe-assets v0.28.0 h1:r1hlPmC9PwfKqX0of9T0tx9xTIczPvqx5N6Bt0LK2LA=

internal/feature/psiphonfeat/psiphon_enabled.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !go1.24 && !ooni_feature_disable_psiphon
1+
//go:build !go1.25 && !ooni_feature_disable_psiphon
22

33
package psiphonfeat
44

internal/feature/psiphonfeat/psiphon_otherwise.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build go1.24 || ooni_feature_disable_psiphon
1+
//go:build go1.25 || ooni_feature_disable_psiphon
22

33
package psiphonfeat
44

0 commit comments

Comments
 (0)