diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-18 06:19:45 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-18 06:19:45 +0800 |
| commit | c1d0693cb19c79bbfd7d1948d0799a9e2795076d (patch) | |
| tree | 7c0c3fbbda3666989286347737351cb8f01a835e /crypto | |
| parent | 5ec8c5f71b2db976ffe51180f20bfd6b4fd94188 (diff) | |
| parent | f965f41b6e8d177f4f06a8421ee071350813a1ac (diff) | |
| download | dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.tar dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.tar.gz dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.tar.bz2 dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.tar.lz dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.tar.xz dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.tar.zst dexon-c1d0693cb19c79bbfd7d1948d0799a9e2795076d.zip | |
Merge pull request #325 from fjl/deps-cleanup
Cleanup imports
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.go | 4 | ||||
| -rw-r--r-- | crypto/key_store_passphrase.go | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index e59250eb2..90e2c8939 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -16,12 +16,12 @@ import ( "errors" "code.google.com/p/go-uuid/uuid" - "code.google.com/p/go.crypto/pbkdf2" - "code.google.com/p/go.crypto/ripemd160" "github.com/ethereum/go-ethereum/crypto/ecies" "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/ethutil" + "golang.org/x/crypto/pbkdf2" + "golang.org/x/crypto/ripemd160" ) func init() { diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go index 74408f874..7d21b6604 100644 --- a/crypto/key_store_passphrase.go +++ b/crypto/key_store_passphrase.go @@ -20,6 +20,7 @@ * @date 2015 * */ + /* This key store behaves as KeyStorePlain with the difference that @@ -64,17 +65,18 @@ package crypto import ( "bytes" - "code.google.com/p/go-uuid/uuid" - "code.google.com/p/go.crypto/scrypt" "crypto/aes" "crypto/cipher" "encoding/hex" "encoding/json" "errors" - "github.com/ethereum/go-ethereum/crypto/randentropy" "io" "os" "path" + + "code.google.com/p/go-uuid/uuid" + "github.com/ethereum/go-ethereum/crypto/randentropy" + "golang.org/x/crypto/scrypt" ) const ( |