diff options
| -rw-r--r-- | internal/wycheproof/eddsa_test.go | 3 | ||||
| -rw-r--r-- | nacl/sign/sign.go | 2 | ||||
| -rw-r--r-- | ssh/agent/client.go | 2 | ||||
| -rw-r--r-- | ssh/agent/server.go | 2 | ||||
| -rw-r--r-- | ssh/keys.go | 2 | ||||
| -rw-r--r-- | ssh/keys_test.go | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/internal/wycheproof/eddsa_test.go b/internal/wycheproof/eddsa_test.go index 0a7fbb7..118dfc0 100644 --- a/internal/wycheproof/eddsa_test.go +++ b/internal/wycheproof/eddsa_test.go @@ -8,9 +8,8 @@ package wycheproof import ( + "crypto/ed25519" "testing" - - "golang.org/x/crypto/ed25519" ) func TestEddsa(t *testing.T) { diff --git a/nacl/sign/sign.go b/nacl/sign/sign.go index 8a6acdc..109c08b 100644 --- a/nacl/sign/sign.go +++ b/nacl/sign/sign.go @@ -21,9 +21,9 @@ package sign import ( + "crypto/ed25519" "io" - "golang.org/x/crypto/ed25519" "golang.org/x/crypto/internal/alias" ) diff --git a/ssh/agent/client.go b/ssh/agent/client.go index c3e112a..9f09aae 100644 --- a/ssh/agent/client.go +++ b/ssh/agent/client.go @@ -16,6 +16,7 @@ import ( "bytes" "crypto/dsa" "crypto/ecdsa" + "crypto/ed25519" "crypto/elliptic" "crypto/rsa" "encoding/base64" @@ -26,7 +27,6 @@ import ( "math/big" "sync" - "golang.org/x/crypto/ed25519" "golang.org/x/crypto/ssh" ) diff --git a/ssh/agent/server.go b/ssh/agent/server.go index 9a769de..dd2e0a3 100644 --- a/ssh/agent/server.go +++ b/ssh/agent/server.go @@ -7,6 +7,7 @@ package agent import ( "crypto/dsa" "crypto/ecdsa" + "crypto/ed25519" "crypto/elliptic" "crypto/rsa" "encoding/binary" @@ -16,7 +17,6 @@ import ( "log" "math/big" - "golang.org/x/crypto/ed25519" "golang.org/x/crypto/ssh" ) diff --git a/ssh/keys.go b/ssh/keys.go index bcaae50..ef1bad7 100644 --- a/ssh/keys.go +++ b/ssh/keys.go @@ -11,6 +11,7 @@ import ( "crypto/cipher" "crypto/dsa" "crypto/ecdsa" + "crypto/ed25519" "crypto/elliptic" "crypto/md5" "crypto/rand" @@ -28,7 +29,6 @@ import ( "math/big" "strings" - "golang.org/x/crypto/ed25519" "golang.org/x/crypto/ssh/internal/bcrypt_pbkdf" ) diff --git a/ssh/keys_test.go b/ssh/keys_test.go index 365d93d..76d2338 100644 --- a/ssh/keys_test.go +++ b/ssh/keys_test.go @@ -8,6 +8,7 @@ import ( "bytes" "crypto/dsa" "crypto/ecdsa" + "crypto/ed25519" "crypto/elliptic" "crypto/rand" "crypto/rsa" @@ -21,7 +22,6 @@ import ( "strings" "testing" - "golang.org/x/crypto/ed25519" "golang.org/x/crypto/ssh/testdata" ) |