TBR Revert "veyron: Update go.tools to its new golang.org location."
This reverts commit 5e2aa37e59e3277bcff2ddd7bef8cfd45db83815.
Change-Id: If298d7929424e9062b9f8c9bfe0cc1444e0081c5
diff --git a/runtimes/google/ipc/stream/crypto/box.go b/runtimes/google/ipc/stream/crypto/box.go
index 7f13e60..24e6328 100644
--- a/runtimes/google/ipc/stream/crypto/box.go
+++ b/runtimes/google/ipc/stream/crypto/box.go
@@ -2,10 +2,10 @@
import (
"bytes"
+ "code.google.com/p/go.crypto/nacl/box"
"crypto/rand"
"encoding/binary"
"fmt"
- "golang.org/x/crypto/nacl/box"
"io"
"net"
"veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher.go b/runtimes/google/ipc/stream/crypto/box_cipher.go
index 6174213..d1e4987 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher.go
@@ -4,8 +4,8 @@
"encoding/binary"
"errors"
- "golang.org/x/crypto/nacl/box"
- "golang.org/x/crypto/salsa20/salsa"
+ "code.google.com/p/go.crypto/nacl/box"
+ "code.google.com/p/go.crypto/salsa20/salsa"
)
// cbox implements a ControlCipher using go.crypto/nacl/box.
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher_test.go b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
index acd26ae..795c9c3 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher_test.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
@@ -5,7 +5,7 @@
"crypto/rand"
"testing"
- "golang.org/x/crypto/nacl/box"
+ "code.google.com/p/go.crypto/nacl/box"
"veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
)
diff --git a/runtimes/google/ipc/stream/vif/auth.go b/runtimes/google/ipc/stream/vif/auth.go
index bba4d16..6a05496 100644
--- a/runtimes/google/ipc/stream/vif/auth.go
+++ b/runtimes/google/ipc/stream/vif/auth.go
@@ -7,7 +7,7 @@
"io"
"net"
- "golang.org/x/crypto/nacl/box"
+ "code.google.com/p/go.crypto/nacl/box"
"veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
"veyron.io/veyron/veyron/runtimes/google/ipc/stream/message"
@@ -49,7 +49,7 @@
// pairs, sending the public key to the peer as a crypto option. The
// remainder of the communication is encrypted as HopSetupStream messages
// using NewControlCipherIPC6, which is based on
-// golang.org/x/crypto/nacl/box.
+// code.google.com/p/go.crypto/nacl/box.
//
// - Once the encrypted HopSetupStream channel is setup, the client and
// server authenticate using the vc.AuthenticateAs{Client,Server} protocol.
