diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 03:55:55 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 03:55:55 +0800 |
| commit | 5e891ea981aabc1435c54decc1572788d3358954 (patch) | |
| tree | 6d7213476dc395f7e55920c05ae9ac66e30eae50 /crypto/crypto.go | |
| parent | aa5b29e2f291322991ceab231267d19b19af72a2 (diff) | |
| parent | 8d9752a557e33341a5fb73239dbae664b2f8aaa0 (diff) | |
| download | dexon-5e891ea981aabc1435c54decc1572788d3358954.tar dexon-5e891ea981aabc1435c54decc1572788d3358954.tar.gz dexon-5e891ea981aabc1435c54decc1572788d3358954.tar.bz2 dexon-5e891ea981aabc1435c54decc1572788d3358954.tar.lz dexon-5e891ea981aabc1435c54decc1572788d3358954.tar.xz dexon-5e891ea981aabc1435c54decc1572788d3358954.tar.zst dexon-5e891ea981aabc1435c54decc1572788d3358954.zip | |
Merge branch 'key_store_and_accounts_integration' of https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-key_store_and_accounts_integration
Diffstat (limited to 'crypto/crypto.go')
| -rw-r--r-- | crypto/crypto.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index f8d6139a8..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,7 +166,7 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error ecKey := ToECDSA(ethPriv) key = &Key{ Id: nil, - Address: pubkeyToAddress(ecKey.PublicKey), + Address: PubkeyToAddress(ecKey.PublicKey), PrivateKey: ecKey, } derivedAddr := ethutil.Bytes2Hex(key.Address) @@ -225,7 +224,7 @@ func PKCS7Unpad(in []byte) []byte { return in[:len(in)-int(padding)] } -func pubkeyToAddress(p ecdsa.PublicKey) []byte { +func PubkeyToAddress(p ecdsa.PublicKey) []byte { pubBytes := FromECDSAPub(&p) return Sha3(pubBytes[1:])[12:] } |