[tor-commits] [obfs4/master] Change the import path for go.crypto.

[yawning at torproject.org]

commit cdeda5724124ca393c87be6d01c84fe4f906d612
Author: Yawning Angel <yawning at torproject.org>
Date:   Wed Jan 14 20:43:04 2015 +0000

    Change the import path for go.crypto.
    
    The Go developers decided to move the go.crypto repository to
    golang.org/x/crypto, and also to transition from hg to git.  The tip of
    tree code.google.com copy of the code is broken due to the import paths
    pointing at the new repository.
    
    While the change here is simple (just update the import location), this
    affects packagers as it now expects the updated package.  Sorry for the
    inconveneince, I blame the Go people.
---
 ChangeLog                           |    1 +
 README.md                           |    2 +-
 common/ntor/ntor.go                 |    4 ++--
 transports/obfs4/framing/framing.go |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e13e753..b2387e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes in version 0.0.4 - UNRELEASED
  - Improve the runtime performance of the obfs4 handshake tests.
+ - Changed the go.crypto import path to the new location (golang.org/x/crypto).
 
 Changes in version 0.0.3 - 2014-10-01
  - Change the obfs4 bridge line format to use a "cert" argument instead of the
diff --git a/README.md b/README.md
index 40d092d..e4d4595 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ listed for clarity.
 
  * Go 1.2.0 or later.   Prior versions of Go (Eg: 1.0.2) are missing certain
    important parts of the runtime library like a SHA256 implementation.
- * go.crypto (https://code.google.com/p/go.crypto)
+ * go.crypto (https://golang.org/x/crypto)
  * go.net (https://code.google.com/p/go.net)
  * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519)
  * SipHash-2-4 (https://github.com/dchest/siphash)
diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go
index d123f38..f17e464 100644
--- a/common/ntor/ntor.go
+++ b/common/ntor/ntor.go
@@ -43,8 +43,8 @@ import (
 	"fmt"
 	"io"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/hkdf"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/hkdf"
 
 	"github.com/agl/ed25519/extra25519"
 
diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
index 04e788f..879765d 100644
--- a/transports/obfs4/framing/framing.go
+++ b/transports/obfs4/framing/framing.go
@@ -67,7 +67,7 @@ import (
 	"fmt"
 	"io"
 
-	"code.google.com/p/go.crypto/nacl/secretbox"
+	"golang.org/x/crypto/nacl/secretbox"
 
 	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
 	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"