forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 13:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 98f9b72e4f into 90f1fe0ed2

Browse source
This commit is contained in:
Jeff R. Allen 2015-09-10 16:40:56 +00:00
commit fcf41a0ec0
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Godeps/Godeps.json generated
View file

@ -6,9 +6,9 @@
], ],
"Deps": [ "Deps": [
{ {
"ImportPath": "code.google.com/p/go-uuid/uuid", "ImportPath": "github.com/pborman/uuid",
"Comment": "null-12", "Comment": "none",
"Rev": "7dda39b2e7d5e265014674c5af696ba4186679e9" "Rev": "cccd189d45f7ac3368a0d127efb7f4d08ae0b655"
}, },
{ {
"ImportPath": "github.com/codegangsta/cli", "ImportPath": "github.com/codegangsta/cli",

2
crypto/crypto.go
View file

@ -33,12 +33,12 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"code.google.com/p/go-uuid/uuid"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto/ecies" "github.com/ethereum/go-ethereum/crypto/ecies"
"github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/crypto/sha3"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/pborman/uuid"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/ripemd160" "golang.org/x/crypto/ripemd160"
) )

2
crypto/key.go
View file

@ -23,8 +23,8 @@ import (
"encoding/json" "encoding/json"
"io" "io"
"code.google.com/p/go-uuid/uuid"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/pborman/uuid"
) )
const ( const (

2
crypto/key_store_passphrase.go
View file

@ -36,9 +36,9 @@ import (
"io" "io"
"reflect" "reflect"
"code.google.com/p/go-uuid/uuid"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto/randentropy" "github.com/ethereum/go-ethereum/crypto/randentropy"
"github.com/pborman/uuid"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/scrypt" "golang.org/x/crypto/scrypt"
) )