diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
| commit | dea65840186fe861017524c9cb59ae07ac97ed06 (patch) | |
| tree | 5cb5e339b9ce77a2a3c92cf8a10c4294fcf7965c /crypto | |
| parent | bb3338df6363d8267a24190584f0908463241a6c (diff) | |
| parent | dd086791acf477da7641c168f82de70ed0b2dca6 (diff) | |
| download | dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.gz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.bz2 dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.lz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.xz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.zst dexon-dea65840186fe861017524c9cb59ae07ac97ed06.zip | |
Merge branch 'develop' into ui
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 ( |