diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-06-01 16:14:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 16:14:11 +0800 |
| commit | f272879e5ac464b7260e898c0de0721c46d59195 (patch) | |
| tree | a4c4f13cf54683b078d72d114d2a580812501655 /accounts | |
| parent | 799a46900076e5315813ca7791f349b8e6eaed0c (diff) | |
| parent | 72dd51e25a5c1553a5a7fc5f0fb84fbe3546682f (diff) | |
| download | dexon-f272879e5ac464b7260e898c0de0721c46d59195.tar dexon-f272879e5ac464b7260e898c0de0721c46d59195.tar.gz dexon-f272879e5ac464b7260e898c0de0721c46d59195.tar.bz2 dexon-f272879e5ac464b7260e898c0de0721c46d59195.tar.lz dexon-f272879e5ac464b7260e898c0de0721c46d59195.tar.xz dexon-f272879e5ac464b7260e898c0de0721c46d59195.tar.zst dexon-f272879e5ac464b7260e898c0de0721c46d59195.zip | |
Merge pull request #14565 from karalabe/relax-privkey-checks
accounts/keystore, crypto: don't enforce key checks on existing keyfiles
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/keystore/keystore_passphrase.go | 6 | ||||
| -rw-r--r-- | accounts/keystore/presale.go | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index 9a5c452c1..679fc15d6 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -182,10 +182,8 @@ func DecryptKey(keyjson []byte, auth string) (*Key, error) { if err != nil { return nil, err } - key, err := crypto.ToECDSA(keyBytes) - if err != nil { - return nil, err - } + key := crypto.ToECDSAUnsafe(keyBytes) + return &Key{ Id: uuid.UUID(keyId), Address: crypto.PubkeyToAddress(key.PublicKey), diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 2f18a64db..ed900ad08 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -74,10 +74,8 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error return nil, err } ethPriv := crypto.Keccak256(plainText) - ecKey, err := crypto.ToECDSA(ethPriv) - if err != nil { - return nil, err - } + ecKey := crypto.ToECDSAUnsafe(ethPriv) + key = &Key{ Id: nil, Address: crypto.PubkeyToAddress(ecKey.PublicKey), |