diff options
| author | Felix Lange <fjl@twurst.com> | 2015-09-14 18:06:59 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-09-14 18:06:59 +0800 |
| commit | a9c809b441146dcd2c3f4d174f00148a510aeb75 (patch) | |
| tree | ce7bb6b4597c97405fed4621e54df5e8bb24c884 /crypto | |
| parent | 55ed8d108d72d12543ecdc6d8c9d9978392dabf0 (diff) | |
| parent | 0d4072777520a665637937efd440e06f18ea0626 (diff) | |
| download | dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.tar dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.tar.gz dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.tar.bz2 dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.tar.lz dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.tar.xz dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.tar.zst dexon-a9c809b441146dcd2c3f4d174f00148a510aeb75.zip | |
Merge pull request #1792 from jeffallen/uuid
Change go-uuid to use the current supported repository.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.go | 2 | ||||
| -rw-r--r-- | crypto/key.go | 2 | ||||
| -rw-r--r-- | crypto/key_store_passphrase.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index a474d6f13..b3a8d730b 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -33,12 +33,12 @@ import ( "encoding/json" "errors" - "code.google.com/p/go-uuid/uuid" "github.com/ethereum/go-ethereum/common" "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/rlp" + "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/ripemd160" ) diff --git a/crypto/key.go b/crypto/key.go index d80b99759..35139b67f 100644 --- a/crypto/key.go +++ b/crypto/key.go @@ -23,8 +23,8 @@ import ( "encoding/json" "io" - "code.google.com/p/go-uuid/uuid" "github.com/ethereum/go-ethereum/common" + "github.com/pborman/uuid" ) const ( diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go index f21af8dd9..c7ee00987 100644 --- a/crypto/key_store_passphrase.go +++ b/crypto/key_store_passphrase.go @@ -36,9 +36,9 @@ import ( "io" "reflect" - "code.google.com/p/go-uuid/uuid" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" ) |