From 8a3eb4b30965975951a92dde8f68ce17cb08ac8e Mon Sep 17 00:00:00 2001
From: Yawning Angel <yawning@torproject.org>
Date: Wed, 25 Jun 2014 16:03:18 +0000
Subject: [PATCH] Change the import paths to point to the tp.o repository.
---
drbg/hash_drbg.go | 2 +-
framing/framing.go | 4 ++--
handshake_ntor.go | 6 +++---
handshake_ntor_test.go | 2 +-
ntor/ntor.go | 2 +-
obfs4.go | 6 +++---
obfs4proxy/obfs4proxy.go | 6 +++---
obfs4proxy/proxy_extras.go | 2 +-
packet.go | 4 ++--
replay_filter.go | 2 +-
weighted_dist.go | 4 ++--
weighted_dist_test.go | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/drbg/hash_drbg.go b/drbg/hash_drbg.go
index 7186fd0..c94902a 100644
--- a/drbg/hash_drbg.go
+++ b/drbg/hash_drbg.go
@@ -37,7 +37,7 @@ import (
"github.com/dchest/siphash"
- "github.com/yawning/obfs4/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
)
// Size is the length of the HashDrbg output.
diff --git a/framing/framing.go b/framing/framing.go
index c053c4c..725a762 100644
--- a/framing/framing.go
+++ b/framing/framing.go
@@ -69,8 +69,8 @@ import (
"code.google.com/p/go.crypto/nacl/secretbox"
- "github.com/yawning/obfs4/csrand"
- "github.com/yawning/obfs4/drbg"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/drbg"
)
const (
diff --git a/handshake_ntor.go b/handshake_ntor.go
index 46e2a13..8192494 100644
--- a/handshake_ntor.go
+++ b/handshake_ntor.go
@@ -38,9 +38,9 @@ import (
"strconv"
"time"
- "github.com/yawning/obfs4/csrand"
- "github.com/yawning/obfs4/framing"
- "github.com/yawning/obfs4/ntor"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/framing"
+ "git.torproject.org/pluggable-transports/obfs4.git/ntor"
)
const (
diff --git a/handshake_ntor_test.go b/handshake_ntor_test.go
index 2f2ae2e..94d2a7f 100644
--- a/handshake_ntor_test.go
+++ b/handshake_ntor_test.go
@@ -31,7 +31,7 @@ import (
"bytes"
"testing"
- "github.com/yawning/obfs4/ntor"
+ "git.torproject.org/pluggable-transports/obfs4.git/ntor"
)
func TestHandshakeNtor(t *testing.T) {
diff --git a/ntor/ntor.go b/ntor/ntor.go
index 4483a6b..b178454 100644
--- a/ntor/ntor.go
+++ b/ntor/ntor.go
@@ -50,7 +50,7 @@ import (
"github.com/agl/ed25519/extra25519"
- "github.com/yawning/obfs4/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
)
const (
diff --git a/obfs4.go b/obfs4.go
index 247583b..4cc159c 100644
--- a/obfs4.go
+++ b/obfs4.go
@@ -42,9 +42,9 @@ import (
"syscall"
"time"
- "github.com/yawning/obfs4/drbg"
- "github.com/yawning/obfs4/framing"
- "github.com/yawning/obfs4/ntor"
+ "git.torproject.org/pluggable-transports/obfs4.git/drbg"
+ "git.torproject.org/pluggable-transports/obfs4.git/framing"
+ "git.torproject.org/pluggable-transports/obfs4.git/ntor"
)
const (
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index b456c30..c49f3d0 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -62,9 +62,9 @@ import (
"syscall"
"git.torproject.org/pluggable-transports/goptlib.git"
- "github.com/yawning/obfs4"
- "github.com/yawning/obfs4/csrand"
- "github.com/yawning/obfs4/ntor"
+ "git.torproject.org/pluggable-transports/obfs4.git"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/ntor"
)
const (
diff --git a/obfs4proxy/proxy_extras.go b/obfs4proxy/proxy_extras.go
index 27b638b..5ead3b8 100644
--- a/obfs4proxy/proxy_extras.go
+++ b/obfs4proxy/proxy_extras.go
@@ -32,7 +32,7 @@ import (
"code.google.com/p/go.net/proxy"
- "github.com/yawning/obfs4"
+ "git.torproject.org/pluggable-transports/obfs4.git"
)
// getProxyDialer is a trival wrapper around the go.net/proxy package to avoid
diff --git a/packet.go b/packet.go
index dee5921..58a5877 100644
--- a/packet.go
+++ b/packet.go
@@ -34,8 +34,8 @@ import (
"io"
"syscall"
- "github.com/yawning/obfs4/drbg"
- "github.com/yawning/obfs4/framing"
+ "git.torproject.org/pluggable-transports/obfs4.git/drbg"
+ "git.torproject.org/pluggable-transports/obfs4.git/framing"
)
const (
diff --git a/replay_filter.go b/replay_filter.go
index cdcd728..b8f284a 100644
--- a/replay_filter.go
+++ b/replay_filter.go
@@ -34,7 +34,7 @@ import (
"github.com/dchest/siphash"
- "github.com/yawning/obfs4/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
)
// maxFilterSize is the maximum capacity of the replay filter. The busiest
diff --git a/weighted_dist.go b/weighted_dist.go
index 7c47cb8..4f1f2a5 100644
--- a/weighted_dist.go
+++ b/weighted_dist.go
@@ -32,8 +32,8 @@ import (
"fmt"
"math/rand"
- "github.com/yawning/obfs4/csrand"
- "github.com/yawning/obfs4/drbg"
+ "git.torproject.org/pluggable-transports/obfs4.git/csrand"
+ "git.torproject.org/pluggable-transports/obfs4.git/drbg"
)
const (
diff --git a/weighted_dist_test.go b/weighted_dist_test.go
index 14fecec..16b93c4 100644
--- a/weighted_dist_test.go
+++ b/weighted_dist_test.go
@@ -31,7 +31,7 @@ import (
"fmt"
"testing"
- "github.com/yawning/obfs4/drbg"
+ "git.torproject.org/pluggable-transports/obfs4.git/drbg"
)
const debug = false
--
GitLab