go.crypto: use golang.org/x/... import paths

LGTM=bradfitz
R=rsc, bradfitz
CC=golang-codereviews
https://golang.org/cl/167190043
diff --git a/bcrypt/bcrypt.go b/bcrypt/bcrypt.go
index 10b8d64..b8e18d7 100644
--- a/bcrypt/bcrypt.go
+++ b/bcrypt/bcrypt.go
@@ -8,11 +8,11 @@
 
 // The code is a port of Provos and Mazières's C implementation.
 import (
-	"code.google.com/p/go.crypto/blowfish"
 	"crypto/rand"
 	"crypto/subtle"
 	"errors"
 	"fmt"
+	"golang.org/x/crypto/blowfish"
 	"io"
 	"strconv"
 )
diff --git a/hkdf/example_test.go b/hkdf/example_test.go
index 4eda6b2..df84395 100644
--- a/hkdf/example_test.go
+++ b/hkdf/example_test.go
@@ -6,10 +6,10 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/hkdf"
 	"crypto/rand"
 	"crypto/sha256"
 	"fmt"
+	"golang.org/x/crypto/hkdf"
 	"io"
 )
 
diff --git a/nacl/box/box.go b/nacl/box/box.go
index a1e58e9..ffe00ba 100644
--- a/nacl/box/box.go
+++ b/nacl/box/box.go
@@ -18,9 +18,9 @@
 package box
 
 import (
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/go.crypto/salsa20/salsa"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/nacl/secretbox"
+	"golang.org/x/crypto/salsa20/salsa"
 	"io"
 )
 
diff --git a/nacl/box/box_test.go b/nacl/box/box_test.go
index 6cf2e15..481ade2 100644
--- a/nacl/box/box_test.go
+++ b/nacl/box/box_test.go
@@ -10,7 +10,7 @@
 	"encoding/hex"
 	"testing"
 
-	"code.google.com/p/go.crypto/curve25519"
+	"golang.org/x/crypto/curve25519"
 )
 
 func TestSealOpen(t *testing.T) {
diff --git a/nacl/secretbox/secretbox.go b/nacl/secretbox/secretbox.go
index ad64c24..ed46ba2 100644
--- a/nacl/secretbox/secretbox.go
+++ b/nacl/secretbox/secretbox.go
@@ -18,8 +18,8 @@
 package secretbox
 
 import (
-	"code.google.com/p/go.crypto/poly1305"
-	"code.google.com/p/go.crypto/salsa20/salsa"
+	"golang.org/x/crypto/poly1305"
+	"golang.org/x/crypto/salsa20/salsa"
 )
 
 // Overhead is the number of bytes of overhead when boxing a message.
diff --git a/openpgp/armor/armor.go b/openpgp/armor/armor.go
index c7ab2ef..e8df91a 100644
--- a/openpgp/armor/armor.go
+++ b/openpgp/armor/armor.go
@@ -9,8 +9,8 @@
 import (
 	"bufio"
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"encoding/base64"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 )
 
diff --git a/openpgp/clearsign/clearsign.go b/openpgp/clearsign/clearsign.go
index 765510e..41a4e43 100644
--- a/openpgp/clearsign/clearsign.go
+++ b/openpgp/clearsign/clearsign.go
@@ -18,9 +18,9 @@
 	"net/textproto"
 	"strconv"
 
-	"code.google.com/p/go.crypto/openpgp/armor"
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/packet"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
 )
 
 // A Block represents a clearsigned message. A signature on a Block can
diff --git a/openpgp/clearsign/clearsign_test.go b/openpgp/clearsign/clearsign_test.go
index 010ae96..51538b9 100644
--- a/openpgp/clearsign/clearsign_test.go
+++ b/openpgp/clearsign/clearsign_test.go
@@ -6,7 +6,7 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp"
+	"golang.org/x/crypto/openpgp"
 	"testing"
 )
 
diff --git a/openpgp/keys.go b/openpgp/keys.go
index ee6c0ee..c4a6640 100644
--- a/openpgp/keys.go
+++ b/openpgp/keys.go
@@ -5,10 +5,10 @@
 package openpgp
 
 import (
-	"code.google.com/p/go.crypto/openpgp/armor"
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/packet"
 	"crypto/rsa"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
 	"io"
 	"time"
 )
diff --git a/openpgp/keys_test.go b/openpgp/keys_test.go
index 99a9699..e0625cb 100644
--- a/openpgp/keys_test.go
+++ b/openpgp/keys_test.go
@@ -4,7 +4,7 @@
 	"testing"
 	"time"
 
-	"code.google.com/p/go.crypto/openpgp/packet"
+	"golang.org/x/crypto/openpgp/packet"
 )
 
 func TestKeyExpiry(t *testing.T) {
diff --git a/openpgp/packet/compressed.go b/openpgp/packet/compressed.go
index f1bd2f5..e8f0b5c 100644
--- a/openpgp/packet/compressed.go
+++ b/openpgp/packet/compressed.go
@@ -5,10 +5,10 @@
 package packet
 
 import (
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"compress/bzip2"
 	"compress/flate"
 	"compress/zlib"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"strconv"
 )
diff --git a/openpgp/packet/encrypted_key.go b/openpgp/packet/encrypted_key.go
index be96bf8..b43522c 100644
--- a/openpgp/packet/encrypted_key.go
+++ b/openpgp/packet/encrypted_key.go
@@ -5,10 +5,10 @@
 package packet
 
 import (
-	"code.google.com/p/go.crypto/openpgp/elgamal"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"crypto/rsa"
 	"encoding/binary"
+	"golang.org/x/crypto/openpgp/elgamal"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"math/big"
 	"strconv"
diff --git a/openpgp/packet/one_pass_signature.go b/openpgp/packet/one_pass_signature.go
index 8b5c547..1713503 100644
--- a/openpgp/packet/one_pass_signature.go
+++ b/openpgp/packet/one_pass_signature.go
@@ -5,10 +5,10 @@
 package packet
 
 import (
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/s2k"
 	"crypto"
 	"encoding/binary"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
 	"io"
 	"strconv"
 )
diff --git a/openpgp/packet/opaque.go b/openpgp/packet/opaque.go
index 5f9ad44..f2e00b9 100644
--- a/openpgp/packet/opaque.go
+++ b/openpgp/packet/opaque.go
@@ -6,7 +6,7 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"io/ioutil"
 )
diff --git a/openpgp/packet/packet.go b/openpgp/packet/packet.go
index 9ffaac6..b1e7a7f 100644
--- a/openpgp/packet/packet.go
+++ b/openpgp/packet/packet.go
@@ -8,11 +8,11 @@
 
 import (
 	"bufio"
-	"code.google.com/p/go.crypto/cast5"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/des"
+	"golang.org/x/crypto/cast5"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"math/big"
 )
diff --git a/openpgp/packet/packet_test.go b/openpgp/packet/packet_test.go
index c2fd72b..1dab5c3 100644
--- a/openpgp/packet/packet_test.go
+++ b/openpgp/packet/packet_test.go
@@ -6,9 +6,9 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"encoding/hex"
 	"fmt"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"io/ioutil"
 	"testing"
diff --git a/openpgp/packet/private_key.go b/openpgp/packet/private_key.go
index 99b628f..9685a34 100644
--- a/openpgp/packet/private_key.go
+++ b/openpgp/packet/private_key.go
@@ -6,13 +6,13 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/elgamal"
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/s2k"
 	"crypto/cipher"
 	"crypto/dsa"
 	"crypto/rsa"
 	"crypto/sha1"
+	"golang.org/x/crypto/openpgp/elgamal"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
 	"io"
 	"io/ioutil"
 	"math/big"
diff --git a/openpgp/packet/public_key.go b/openpgp/packet/public_key.go
index ec64a8d..26bd9cc 100644
--- a/openpgp/packet/public_key.go
+++ b/openpgp/packet/public_key.go
@@ -6,8 +6,6 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/elgamal"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"crypto"
 	"crypto/dsa"
 	"crypto/ecdsa"
@@ -18,6 +16,8 @@
 	_ "crypto/sha512"
 	"encoding/binary"
 	"fmt"
+	"golang.org/x/crypto/openpgp/elgamal"
+	"golang.org/x/crypto/openpgp/errors"
 	"hash"
 	"io"
 	"math/big"
diff --git a/openpgp/packet/public_key_v3.go b/openpgp/packet/public_key_v3.go
index 0897bcc..1641248 100644
--- a/openpgp/packet/public_key_v3.go
+++ b/openpgp/packet/public_key_v3.go
@@ -16,7 +16,7 @@
 	"strconv"
 	"time"
 
-	"code.google.com/p/go.crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/errors"
 )
 
 // PublicKeyV3 represents older, version 3 public keys. These keys are less secure and
diff --git a/openpgp/packet/reader.go b/openpgp/packet/reader.go
index 3325d63..753bf8f 100644
--- a/openpgp/packet/reader.go
+++ b/openpgp/packet/reader.go
@@ -5,7 +5,7 @@
 package packet
 
 import (
-	"code.google.com/p/go.crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 )
 
diff --git a/openpgp/packet/signature.go b/openpgp/packet/signature.go
index b761c6d..79cf993 100644
--- a/openpgp/packet/signature.go
+++ b/openpgp/packet/signature.go
@@ -5,12 +5,12 @@
 package packet
 
 import (
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/s2k"
 	"crypto"
 	"crypto/dsa"
 	"crypto/rsa"
 	"encoding/binary"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
 	"hash"
 	"io"
 	"strconv"
diff --git a/openpgp/packet/signature_v3.go b/openpgp/packet/signature_v3.go
index 1bba74d..6edff88 100644
--- a/openpgp/packet/signature_v3.go
+++ b/openpgp/packet/signature_v3.go
@@ -12,8 +12,8 @@
 	"strconv"
 	"time"
 
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/s2k"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
 )
 
 // SignatureV3 represents older version 3 signatures. These signatures are less secure
diff --git a/openpgp/packet/signature_v3_test.go b/openpgp/packet/signature_v3_test.go
index 57f26b5..ad7b62a 100644
--- a/openpgp/packet/signature_v3_test.go
+++ b/openpgp/packet/signature_v3_test.go
@@ -12,7 +12,7 @@
 	"io/ioutil"
 	"testing"
 
-	"code.google.com/p/go.crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/armor"
 )
 
 func TestSignatureV3Read(t *testing.T) {
diff --git a/openpgp/packet/symmetric_key_encrypted.go b/openpgp/packet/symmetric_key_encrypted.go
index 30d02b2..23721bc 100644
--- a/openpgp/packet/symmetric_key_encrypted.go
+++ b/openpgp/packet/symmetric_key_encrypted.go
@@ -10,8 +10,8 @@
 	"io"
 	"strconv"
 
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/s2k"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
 )
 
 // This is the largest session key that we'll support. Since no 512-bit cipher
diff --git a/openpgp/packet/symmetrically_encrypted.go b/openpgp/packet/symmetrically_encrypted.go
index 04dd670..6126030 100644
--- a/openpgp/packet/symmetrically_encrypted.go
+++ b/openpgp/packet/symmetrically_encrypted.go
@@ -5,10 +5,10 @@
 package packet
 
 import (
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"crypto/cipher"
 	"crypto/sha1"
 	"crypto/subtle"
+	"golang.org/x/crypto/openpgp/errors"
 	"hash"
 	"io"
 	"strconv"
diff --git a/openpgp/packet/symmetrically_encrypted_test.go b/openpgp/packet/symmetrically_encrypted_test.go
index c4845eb..c5c00f7 100644
--- a/openpgp/packet/symmetrically_encrypted_test.go
+++ b/openpgp/packet/symmetrically_encrypted_test.go
@@ -6,9 +6,9 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	"crypto/sha1"
 	"encoding/hex"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"io/ioutil"
 	"testing"
diff --git a/openpgp/read.go b/openpgp/read.go
index fa530dd..08129d7 100644
--- a/openpgp/read.go
+++ b/openpgp/read.go
@@ -6,11 +6,11 @@
 package openpgp
 
 import (
-	"code.google.com/p/go.crypto/openpgp/armor"
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/packet"
 	"crypto"
 	_ "crypto/sha256"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
 	"hash"
 	"io"
 	"strconv"
diff --git a/openpgp/read_test.go b/openpgp/read_test.go
index 796095c..c2720ae 100644
--- a/openpgp/read_test.go
+++ b/openpgp/read_test.go
@@ -6,9 +6,9 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/openpgp/errors"
 	_ "crypto/sha512"
 	"encoding/hex"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"io/ioutil"
 	"strings"
diff --git a/openpgp/s2k/s2k.go b/openpgp/s2k/s2k.go
index cf06a25..9e993ae 100644
--- a/openpgp/s2k/s2k.go
+++ b/openpgp/s2k/s2k.go
@@ -12,7 +12,7 @@
 	"io"
 	"strconv"
 
-	"code.google.com/p/go.crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/errors"
 )
 
 // Config collects configuration parameters for s2k key-stretching
diff --git a/openpgp/s2k/s2k_test.go b/openpgp/s2k/s2k_test.go
index ed2255d..2e3d7b6 100644
--- a/openpgp/s2k/s2k_test.go
+++ b/openpgp/s2k/s2k_test.go
@@ -15,7 +15,7 @@
 	"encoding/hex"
 	"testing"
 
-	_ "code.google.com/p/go.crypto/ripemd160"
+	_ "golang.org/x/crypto/ripemd160"
 )
 
 var saltedTests = []struct {
diff --git a/openpgp/write.go b/openpgp/write.go
index a67ffca..e471174 100644
--- a/openpgp/write.go
+++ b/openpgp/write.go
@@ -5,11 +5,11 @@
 package openpgp
 
 import (
-	"code.google.com/p/go.crypto/openpgp/armor"
-	"code.google.com/p/go.crypto/openpgp/errors"
-	"code.google.com/p/go.crypto/openpgp/packet"
-	"code.google.com/p/go.crypto/openpgp/s2k"
 	"crypto"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
+	"golang.org/x/crypto/openpgp/s2k"
 	"hash"
 	"io"
 	"strconv"
diff --git a/salsa20/salsa20.go b/salsa20/salsa20.go
index c308ca3..c236375 100644
--- a/salsa20/salsa20.go
+++ b/salsa20/salsa20.go
@@ -24,7 +24,7 @@
 // TODO(agl): implement XORKeyStream12 and XORKeyStream8 - the reduced round variants of Salsa20.
 
 import (
-	"code.google.com/p/go.crypto/salsa20/salsa"
+	"golang.org/x/crypto/salsa20/salsa"
 )
 
 // XORKeyStream crypts bytes from in to out using the given key and nonce. In
diff --git a/scrypt/scrypt.go b/scrypt/scrypt.go
index f7a9fe1..30737b0 100644
--- a/scrypt/scrypt.go
+++ b/scrypt/scrypt.go
@@ -11,7 +11,7 @@
 	"crypto/sha256"
 	"errors"
 
-	"code.google.com/p/go.crypto/pbkdf2"
+	"golang.org/x/crypto/pbkdf2"
 )
 
 const maxInt = int(^uint(0) >> 1)
diff --git a/ssh/agent/client.go b/ssh/agent/client.go
index a87b101..7f2ae50 100644
--- a/ssh/agent/client.go
+++ b/ssh/agent/client.go
@@ -24,7 +24,7 @@
 	"math/big"
 	"sync"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 // Agent represents the capabilities of an ssh-agent.
diff --git a/ssh/agent/client_test.go b/ssh/agent/client_test.go
index 03a7faa..80e2c2c 100644
--- a/ssh/agent/client_test.go
+++ b/ssh/agent/client_test.go
@@ -15,7 +15,7 @@
 	"strconv"
 	"testing"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 // startAgent executes ssh-agent, and returns a Agent interface to it.
diff --git a/ssh/agent/forward.go b/ssh/agent/forward.go
index 5c84ee2..fd24ba9 100644
--- a/ssh/agent/forward.go
+++ b/ssh/agent/forward.go
@@ -10,7 +10,7 @@
 	"net"
 	"sync"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 // RequestAgentForwarding sets up agent forwarding for the session.
diff --git a/ssh/agent/keyring.go b/ssh/agent/keyring.go
index ecfa66f..831a5b9 100644
--- a/ssh/agent/keyring.go
+++ b/ssh/agent/keyring.go
@@ -12,7 +12,7 @@
 	"fmt"
 	"sync"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 type privKey struct {
diff --git a/ssh/agent/server.go b/ssh/agent/server.go
index 2d55dc9..be9df0e 100644
--- a/ssh/agent/server.go
+++ b/ssh/agent/server.go
@@ -12,7 +12,7 @@
 	"log"
 	"math/big"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 // Server wraps an Agent and uses it to implement the agent side of
diff --git a/ssh/agent/server_test.go b/ssh/agent/server_test.go
index ad2996b..def5f8c 100644
--- a/ssh/agent/server_test.go
+++ b/ssh/agent/server_test.go
@@ -7,7 +7,7 @@
 import (
 	"testing"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 func TestServer(t *testing.T) {
diff --git a/ssh/agent/testdata_test.go b/ssh/agent/testdata_test.go
index 6bb75a9..b7a8781 100644
--- a/ssh/agent/testdata_test.go
+++ b/ssh/agent/testdata_test.go
@@ -12,8 +12,8 @@
 	"crypto/rand"
 	"fmt"
 
-	"code.google.com/p/go.crypto/ssh"
-	"code.google.com/p/go.crypto/ssh/testdata"
+	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/testdata"
 )
 
 var (
diff --git a/ssh/example_test.go b/ssh/example_test.go
index d9d6a54..22f42ec 100644
--- a/ssh/example_test.go
+++ b/ssh/example_test.go
@@ -12,7 +12,7 @@
 	"net"
 	"net/http"
 
-	"code.google.com/p/go.crypto/ssh/terminal"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 func ExampleNewServerConn() {
diff --git a/ssh/keys_test.go b/ssh/keys_test.go
index cd49565..36b97ad 100644
--- a/ssh/keys_test.go
+++ b/ssh/keys_test.go
@@ -17,7 +17,7 @@
 	"strings"
 	"testing"
 
-	"code.google.com/p/go.crypto/ssh/testdata"
+	"golang.org/x/crypto/ssh/testdata"
 )
 
 func rawKey(pub PublicKey) interface{} {
diff --git a/ssh/session_test.go b/ssh/session_test.go
index cc26573..fce9868 100644
--- a/ssh/session_test.go
+++ b/ssh/session_test.go
@@ -14,7 +14,7 @@
 	"math/rand"
 	"testing"
 
-	"code.google.com/p/go.crypto/ssh/terminal"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 type serverType func(Channel, <-chan *Request, *testing.T)
diff --git a/ssh/test/agent_unix_test.go b/ssh/test/agent_unix_test.go
index b56c58c..502e24f 100644
--- a/ssh/test/agent_unix_test.go
+++ b/ssh/test/agent_unix_test.go
@@ -10,8 +10,8 @@
 	"bytes"
 	"testing"
 
-	"code.google.com/p/go.crypto/ssh"
-	"code.google.com/p/go.crypto/ssh/agent"
+	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/agent"
 )
 
 func TestAgentForward(t *testing.T) {
diff --git a/ssh/test/cert_test.go b/ssh/test/cert_test.go
index 95a12c1..364790f 100644
--- a/ssh/test/cert_test.go
+++ b/ssh/test/cert_test.go
@@ -10,7 +10,7 @@
 	"crypto/rand"
 	"testing"
 
-	"code.google.com/p/go.crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 func TestCertLogin(t *testing.T) {
diff --git a/ssh/test/session_test.go b/ssh/test/session_test.go
index d8d35a5..0b7892b 100644
--- a/ssh/test/session_test.go
+++ b/ssh/test/session_test.go
@@ -10,8 +10,8 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/ssh"
 	"errors"
+	"golang.org/x/crypto/ssh"
 	"io"
 	"strings"
 	"testing"
diff --git a/ssh/test/test_unix_test.go b/ssh/test/test_unix_test.go
index 3ac310e..f1fc50b 100644
--- a/ssh/test/test_unix_test.go
+++ b/ssh/test/test_unix_test.go
@@ -21,8 +21,8 @@
 	"testing"
 	"text/template"
 
-	"code.google.com/p/go.crypto/ssh"
-	"code.google.com/p/go.crypto/ssh/testdata"
+	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/testdata"
 )
 
 const sshd_config = `
diff --git a/ssh/test/testdata_test.go b/ssh/test/testdata_test.go
index 7f50fbe..ae48c75 100644
--- a/ssh/test/testdata_test.go
+++ b/ssh/test/testdata_test.go
@@ -12,8 +12,8 @@
 	"crypto/rand"
 	"fmt"
 
-	"code.google.com/p/go.crypto/ssh"
-	"code.google.com/p/go.crypto/ssh/testdata"
+	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/testdata"
 )
 
 var (
diff --git a/ssh/testdata_test.go b/ssh/testdata_test.go
index 302fdc8..f2828c1 100644
--- a/ssh/testdata_test.go
+++ b/ssh/testdata_test.go
@@ -12,7 +12,7 @@
 	"crypto/rand"
 	"fmt"
 
-	"code.google.com/p/go.crypto/ssh/testdata"
+	"golang.org/x/crypto/ssh/testdata"
 )
 
 var (