From ab8a51214a2d3d3fa8e3d7c45163ad373ebf2ba7 Mon Sep 17 00:00:00 2001 From: Brandon Wiley Date: Mon, 21 Mar 2016 11:56:20 -0500 Subject: Updated import paths --- transports/meeklite/base.go | 2 +- transports/meeklite/meek.go | 2 +- transports/obfs2/obfs2.go | 4 ++-- transports/obfs3/obfs3.go | 6 +++--- transports/obfs4/framing/framing.go | 4 ++-- transports/obfs4/handshake_ntor.go | 8 ++++---- transports/obfs4/handshake_ntor_test.go | 4 ++-- transports/obfs4/obfs4.go | 12 ++++++------ transports/obfs4/packet.go | 4 ++-- transports/obfs4/statefile.go | 6 +++--- transports/scramblesuit/base.go | 2 +- transports/scramblesuit/conn.go | 8 ++++---- transports/scramblesuit/handshake_ticket.go | 2 +- transports/scramblesuit/handshake_uniformdh.go | 4 ++-- transports/transports.go | 12 ++++++------ 15 files changed, 40 insertions(+), 40 deletions(-) (limited to 'transports') diff --git a/transports/meeklite/base.go b/transports/meeklite/base.go index 2a4cf80..6401885 100644 --- a/transports/meeklite/base.go +++ b/transports/meeklite/base.go @@ -37,7 +37,7 @@ import ( "net" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" + "github.com/OperatorFoundation/obfs4/transports/base" ) const transportName = "meek_lite" diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go index f0d29db..79012ac 100644 --- a/transports/meeklite/meek.go +++ b/transports/meeklite/meek.go @@ -44,7 +44,7 @@ import ( "time" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" + "github.com/OperatorFoundation/obfs4/transports/base" ) const ( diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go index 8fa6cb8..8bbdbaa 100644 --- a/transports/obfs2/obfs2.go +++ b/transports/obfs2/obfs2.go @@ -41,8 +41,8 @@ import ( "time" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/transports/base" ) const ( diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go index 08d6be4..c872129 100644 --- a/transports/obfs3/obfs3.go +++ b/transports/obfs3/obfs3.go @@ -41,9 +41,9 @@ import ( "time" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/common/uniformdh" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/common/uniformdh" + "github.com/OperatorFoundation/obfs4/transports/base" ) const ( diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go index 815a990..9eaba69 100644 --- a/transports/obfs4/framing/framing.go +++ b/transports/obfs4/framing/framing.go @@ -69,8 +69,8 @@ import ( "golang.org/x/crypto/nacl/secretbox" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/common/drbg" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/common/drbg" ) const ( diff --git a/transports/obfs4/handshake_ntor.go b/transports/obfs4/handshake_ntor.go index 57de460..ed7c114 100644 --- a/transports/obfs4/handshake_ntor.go +++ b/transports/obfs4/handshake_ntor.go @@ -38,10 +38,10 @@ import ( "strconv" "time" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/common/ntor" - "git.torproject.org/pluggable-transports/obfs4.git/common/replayfilter" - "git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4/framing" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/common/ntor" + "github.com/OperatorFoundation/obfs4/common/replayfilter" + "github.com/OperatorFoundation/obfs4/transports/obfs4/framing" ) const ( diff --git a/transports/obfs4/handshake_ntor_test.go b/transports/obfs4/handshake_ntor_test.go index b575093..04afcef 100644 --- a/transports/obfs4/handshake_ntor_test.go +++ b/transports/obfs4/handshake_ntor_test.go @@ -31,8 +31,8 @@ import ( "bytes" "testing" - "git.torproject.org/pluggable-transports/obfs4.git/common/ntor" - "git.torproject.org/pluggable-transports/obfs4.git/common/replayfilter" + "github.com/OperatorFoundation/obfs4/common/ntor" + "github.com/OperatorFoundation/obfs4/common/replayfilter" ) func TestHandshakeNtorClient(t *testing.T) { diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go index 40b1406..269e1c6 100644 --- a/transports/obfs4/obfs4.go +++ b/transports/obfs4/obfs4.go @@ -41,12 +41,12 @@ import ( "time" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/common/drbg" - "git.torproject.org/pluggable-transports/obfs4.git/common/ntor" - "git.torproject.org/pluggable-transports/obfs4.git/common/probdist" - "git.torproject.org/pluggable-transports/obfs4.git/common/replayfilter" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" - "git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4/framing" + "github.com/OperatorFoundation/obfs4/common/drbg" + "github.com/OperatorFoundation/obfs4/common/ntor" + "github.com/OperatorFoundation/obfs4/common/probdist" + "github.com/OperatorFoundation/obfs4/common/replayfilter" + "github.com/OperatorFoundation/obfs4/transports/base" + "github.com/OperatorFoundation/obfs4/transports/obfs4/framing" ) const ( diff --git a/transports/obfs4/packet.go b/transports/obfs4/packet.go index 461ad54..ac3028a 100644 --- a/transports/obfs4/packet.go +++ b/transports/obfs4/packet.go @@ -33,8 +33,8 @@ import ( "fmt" "io" - "git.torproject.org/pluggable-transports/obfs4.git/common/drbg" - "git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4/framing" + "github.com/OperatorFoundation/obfs4/common/drbg" + "github.com/OperatorFoundation/obfs4/transports/obfs4/framing" ) const ( diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go index 6c34f35..6f89c6c 100644 --- a/transports/obfs4/statefile.go +++ b/transports/obfs4/statefile.go @@ -38,9 +38,9 @@ import ( "strings" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/common/drbg" - "git.torproject.org/pluggable-transports/obfs4.git/common/ntor" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/common/drbg" + "github.com/OperatorFoundation/obfs4/common/ntor" ) const ( diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go index 7a71398..b6f7cb7 100644 --- a/transports/scramblesuit/base.go +++ b/transports/scramblesuit/base.go @@ -34,7 +34,7 @@ import ( "net" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" + "github.com/OperatorFoundation/obfs4/transports/base" ) const transportName = "scramblesuit" diff --git a/transports/scramblesuit/conn.go b/transports/scramblesuit/conn.go index b8a27c7..5efd12f 100644 --- a/transports/scramblesuit/conn.go +++ b/transports/scramblesuit/conn.go @@ -43,10 +43,10 @@ import ( "time" "git.torproject.org/pluggable-transports/goptlib.git" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/common/drbg" - "git.torproject.org/pluggable-transports/obfs4.git/common/probdist" - "git.torproject.org/pluggable-transports/obfs4.git/common/uniformdh" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/common/drbg" + "github.com/OperatorFoundation/obfs4/common/probdist" + "github.com/OperatorFoundation/obfs4/common/uniformdh" ) const ( diff --git a/transports/scramblesuit/handshake_ticket.go b/transports/scramblesuit/handshake_ticket.go index ad9b4d4..c9b97cc 100644 --- a/transports/scramblesuit/handshake_ticket.go +++ b/transports/scramblesuit/handshake_ticket.go @@ -42,7 +42,7 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" + "github.com/OperatorFoundation/obfs4/common/csrand" ) const ( diff --git a/transports/scramblesuit/handshake_uniformdh.go b/transports/scramblesuit/handshake_uniformdh.go index 4b77e5a..1a577e8 100644 --- a/transports/scramblesuit/handshake_uniformdh.go +++ b/transports/scramblesuit/handshake_uniformdh.go @@ -36,8 +36,8 @@ import ( "strconv" "time" - "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" - "git.torproject.org/pluggable-transports/obfs4.git/common/uniformdh" + "github.com/OperatorFoundation/obfs4/common/csrand" + "github.com/OperatorFoundation/obfs4/common/uniformdh" ) const ( diff --git a/transports/transports.go b/transports/transports.go index 51a3f08..affd48e 100644 --- a/transports/transports.go +++ b/transports/transports.go @@ -33,12 +33,12 @@ import ( "fmt" "sync" - "git.torproject.org/pluggable-transports/obfs4.git/transports/base" - "git.torproject.org/pluggable-transports/obfs4.git/transports/meeklite" - "git.torproject.org/pluggable-transports/obfs4.git/transports/obfs2" - "git.torproject.org/pluggable-transports/obfs4.git/transports/obfs3" - "git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4" - "git.torproject.org/pluggable-transports/obfs4.git/transports/scramblesuit" + "github.com/OperatorFoundation/obfs4/transports/base" + "github.com/OperatorFoundation/obfs4/transports/meeklite" + "github.com/OperatorFoundation/obfs4/transports/obfs2" + "github.com/OperatorFoundation/obfs4/transports/obfs3" + "github.com/OperatorFoundation/obfs4/transports/obfs4" + "github.com/OperatorFoundation/obfs4/transports/scramblesuit" ) var transportMapLock sync.Mutex -- cgit v1.2.3