diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 05:21:26 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 05:21:26 +0800 |
| commit | 8284bef0727e3e7c801c68b1c7ff59127d4cd69a (patch) | |
| tree | 8bff6e7b19c8891e76cfd2f3024a48f84711a369 /crypto/crypto.go | |
| parent | 32fbc0d334220c4be2c2b7af856523aafa5b8a44 (diff) | |
| parent | fd5d061d49ae32db3ebf8b8e6a14380742701661 (diff) | |
| download | dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.tar dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.tar.gz dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.tar.bz2 dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.tar.lz dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.tar.xz dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.tar.zst dexon-8284bef0727e3e7c801c68b1c7ff59127d4cd69a.zip | |
Merge branch 'develop' 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:] +} |