diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-30 01:28:55 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-30 01:28:55 +0800 |
| commit | 1cfea1113ac90b5214560ea6db923106f638c4b8 (patch) | |
| tree | 5a539d60640da4ee4b1ddd62f703f715523c411a /crypto/crypto.go | |
| parent | 726852e3d3ba5c2167bbdb3bdd3ecbaff6b4f242 (diff) | |
| parent | 6488a392a347d0d47212fdc78386e3e0e5841d7d (diff) | |
| download | dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.tar dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.tar.gz dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.tar.bz2 dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.tar.lz dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.tar.xz dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.tar.zst dexon-1cfea1113ac90b5214560ea6db923106f638c4b8.zip | |
Merge branch 'qt5.4' of github.com:ethereum/go-ethereum into qt5.4
Diffstat (limited to 'crypto/crypto.go')
| -rw-r--r-- | crypto/crypto.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index 4b2cc7bb4..effa703d0 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -133,8 +133,7 @@ func ImportPreSaleKey(keyStore KeyStore2, keyJSON []byte, password string) (*Key if err != nil { return nil, err } - id := uuid.NewRandom() - key.Id = &id + key.Id = uuid.NewRandom() err = keyStore.StoreKey(key, password) return key, err } @@ -167,9 +166,10 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error ecKey := ToECDSA(ethPriv) key = &Key{ Id: nil, + Address: PubkeyToAddress(ecKey.PublicKey), PrivateKey: ecKey, } - derivedAddr := ethutil.Bytes2Hex(key.Address()) + derivedAddr := ethutil.Bytes2Hex(key.Address) expectedAddr := preSaleKeyStruct.EthAddr if derivedAddr != expectedAddr { err = errors.New("decrypted addr not equal to expected addr") @@ -223,3 +223,8 @@ func PKCS7Unpad(in []byte) []byte { } return in[:len(in)-int(padding)] } + +func PubkeyToAddress(p ecdsa.PublicKey) []byte { + pubBytes := FromECDSAPub(&p) + return Sha3(pubBytes[1:])[12:] +} |