[tor-commits] [pluggable-transports/obfs4] 01/02: Use goptlib from gitlab.torproject.org

19 Apr 2023

This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main
in repository pluggable-transports/obfs4.
commit 2dedd163bc543b6d9e3ba2a03da1e93185eed0d5
Author: meskio meskio@torproject.org
AuthorDate: Tue Apr 18 17:33:35 2023 +0200
Use goptlib from gitlab.torproject.org
---
 common/socks5/args.go           | 2 +-
 common/socks5/args_test.go      | 2 +-
 common/socks5/socks5.go         | 2 +-
 go.mod                          | 2 +-
 go.sum                          | 7 ++-----
 obfs4proxy/obfs4proxy.go        | 2 +-
 obfs4proxy/pt_extras.go         | 2 +-
 transports/base/base.go         | 2 +-
 transports/meeklite/base.go     | 2 +-
 transports/meeklite/meek.go     | 2 +-
 transports/obfs2/obfs2.go       | 2 +-
 transports/obfs3/obfs3.go       | 2 +-
 transports/obfs4/obfs4.go       | 2 +-
 transports/obfs4/statefile.go   | 2 +-
 transports/scramblesuit/base.go | 2 +-
 transports/scramblesuit/conn.go | 2 +-
 16 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/common/socks5/args.go b/common/socks5/args.go
index a5efb43..3b398d3 100644
--- a/common/socks5/args.go
+++ b/common/socks5/args.go
@@ -29,7 +29,7 @@ package socks5
import (
    "fmt"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
 )
// parseClientParameters takes a client parameter string formatted according to
diff --git a/common/socks5/args_test.go b/common/socks5/args_test.go
index d9d3f22..8683e8c 100644
--- a/common/socks5/args_test.go
+++ b/common/socks5/args_test.go
@@ -5,7 +5,7 @@ package socks5
 import (
    "testing"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
 )
func stringSlicesEqual(a, b []string) bool {
diff --git a/common/socks5/socks5.go b/common/socks5/socks5.go
index 7630d3d..a619256 100644
--- a/common/socks5/socks5.go
+++ b/common/socks5/socks5.go
@@ -46,7 +46,7 @@ import (
    "syscall"
    "time"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
 )
const (
diff --git a/go.mod b/go.mod
index 0dea33e..e106f01 100644
--- a/go.mod
+++ b/go.mod
@@ -2,10 +2,10 @@ module gitlab.com/yawning/obfs4.git
require (
    filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20
-	git.torproject.org/pluggable-transports/goptlib.git v1.0.0
    github.com/dchest/siphash v1.2.1
    github.com/refraction-networking/utls v1.1.5
    gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb
+	gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0
    golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
    golang.org/x/net v0.0.0-20220909164309-bea034e7d591
 )
diff --git a/go.sum b/go.sum
index dd093aa..e2ba96f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,5 @@
 filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20 h1:iJoUgXvhagsNMrJrvavw7vu1eG8+hm6jLOxlLFcoODw=
 filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-git.torproject.org/pluggable-transports/goptlib.git v1.0.0 h1:ElTwFFPKf/tA6x5nuIk9g49JZzS4T5WN+eTQTjqd00A=
-git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4=
@@ -12,18 +10,17 @@ github.com/refraction-networking/utls v1.1.5 h1:JtrojoNhbUQkBqEg05sP3gDgDj6hIEAA
 github.com/refraction-networking/utls v1.1.5/go.mod h1:jRQxtYi7nkq1p28HF2lwOH5zQm9aC8rpK0O9lIIzGh8=
 gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb h1:qRSZHsODmAP5qDvb3YsO7Qnf3TRiVbGxNG/WYnlM4/o=
 gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb/go.mod h1:gvdJuZuO/tPZyhEV8K3Hmoxv/DWud5L4qEQxfYjEUTo=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0 h1:Y7fHDMy11yyjM+YlHfcM3svaujdL+m5DqS444wbj8o4=
+gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0/go.mod h1:70bhd4JKW/+1HLfm+TMrgHJsUHG4coelMWwiVEJ2gAg=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index f295926..3fca9a0 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -41,7 +41,7 @@ import (
    "sync"
    "syscall"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/common/log"
    "gitlab.com/yawning/obfs4.git/common/socks5"
    "gitlab.com/yawning/obfs4.git/transports"
diff --git a/obfs4proxy/pt_extras.go b/obfs4proxy/pt_extras.go
index 18bc2df..6c2cca5 100644
--- a/obfs4proxy/pt_extras.go
+++ b/obfs4proxy/pt_extras.go
@@ -35,7 +35,7 @@ import (
    "os"
    "strconv"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
 )
// This file contains things that probably should be in goptlib but are not
diff --git a/transports/base/base.go b/transports/base/base.go
index bc6e025..0c37d05 100644
--- a/transports/base/base.go
+++ b/transports/base/base.go
@@ -32,7 +32,7 @@ package base // import "gitlab.com/yawning/obfs4.git/transports/base"
 import (
    "net"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
 )
type DialFunc func(string, string) (net.Conn, error)
diff --git a/transports/meeklite/base.go b/transports/meeklite/base.go
index e9d8ca1..0f21509 100644
--- a/transports/meeklite/base.go
+++ b/transports/meeklite/base.go
@@ -36,7 +36,7 @@ import (
    "fmt"
    "net"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/transports/base"
 )
diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go
index 8f9fe35..55d84ae 100644
--- a/transports/meeklite/meek.go
+++ b/transports/meeklite/meek.go
@@ -46,7 +46,7 @@ import (
utls "github.com/refraction-networking/utls"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/transports/base"
 )
diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go
index 531bcd4..cc07a37 100644
--- a/transports/obfs2/obfs2.go
+++ b/transports/obfs2/obfs2.go
@@ -40,7 +40,7 @@ import (
    "net"
    "time"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/common/csrand"
    "gitlab.com/yawning/obfs4.git/transports/base"
 )
diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go
index 42bdd90..aed5b09 100644
--- a/transports/obfs3/obfs3.go
+++ b/transports/obfs3/obfs3.go
@@ -40,7 +40,7 @@ import (
    "net"
    "time"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/common/csrand"
    "gitlab.com/yawning/obfs4.git/common/uniformdh"
    "gitlab.com/yawning/obfs4.git/transports/base"
diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go
index 9723735..7503a9b 100644
--- a/transports/obfs4/obfs4.go
+++ b/transports/obfs4/obfs4.go
@@ -42,7 +42,7 @@ import (
    "syscall"
    "time"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/common/drbg"
    "gitlab.com/yawning/obfs4.git/common/ntor"
    "gitlab.com/yawning/obfs4.git/common/probdist"
diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go
index cbf1d6e..8ebab9a 100644
--- a/transports/obfs4/statefile.go
+++ b/transports/obfs4/statefile.go
@@ -37,7 +37,7 @@ import (
    "strconv"
    "strings"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/common/csrand"
    "gitlab.com/yawning/obfs4.git/common/drbg"
    "gitlab.com/yawning/obfs4.git/common/ntor"
diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go
index 655ad7a..0462452 100644
--- a/transports/scramblesuit/base.go
+++ b/transports/scramblesuit/base.go
@@ -33,7 +33,7 @@ import (
    "fmt"
    "net"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/transports/base"
 )
diff --git a/transports/scramblesuit/conn.go b/transports/scramblesuit/conn.go
index cc18e18..22a79ab 100644
--- a/transports/scramblesuit/conn.go
+++ b/transports/scramblesuit/conn.go
@@ -42,7 +42,7 @@ import (
    "net"
    "time"
-	"git.torproject.org/pluggable-transports/goptlib.git"
+	"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
    "gitlab.com/yawning/obfs4.git/common/csrand"
    "gitlab.com/yawning/obfs4.git/common/drbg"
    "gitlab.com/yawning/obfs4.git/common/probdist"
-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[tor-commits] [pluggable-transports/obfs4] 01/02: Use goptlib from gitlab.torproject.org