aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/crypto.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-09-22 16:34:58 +0800
committerzelig <viktor.tron@gmail.com>2015-10-22 06:22:39 +0800
commit8b81ad1fc40080af441c0c6df94f0b2ea46e320b (patch)
tree7d8817ec84be38b911f967f1ecd5618d02e4caa9 /crypto/crypto.go
parent58d0752fdd1c7363fb1a127cd7e0a86d7602be02 (diff)
downloaddexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.gz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.zst
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.zip
console:
* lines with leading space are ommitted from history * exit processed even with whitespace around * all whitespace lines (not only empty ones) are ignored add 7 missing commands to admin api autocomplete registrar: methods now return proper error if reg addresses are not set. fixes #1457 rpc/console: fix personal.newAccount() regression. Now all comms accept interactive password registrar: add registrar tests for errors crypto: catch AES decryption error on presale wallet import + fix error msg format. fixes #1580 CLI: improve error message when starting a second instance of geth. fixes #1564 cli/accounts: unlock multiple accounts. fixes #1785 * make unlocking multiple accounts work with inline <() fd * passwdfile now correctly read only once * improve logs * fix CLI help text for unlocking fix regression with docRoot / admin API * docRoot/jspath passed to rpc/api ParseApis, which passes onto adminApi * docRoot field for JS console in order to pass when RPC is (re)started * improve flag desc for jspath common/docserver: catch http errors from response fix rpc/api tests common/natspec: fix end to end test (skipped because takes 8s) registrar: fix major regression: * deploy registrars on frontier * register HashsReg and UrlHint in GlobalRegistrar. * set all 3 contract addresses in code * zero out addresses first in tests
Diffstat (limited to 'crypto/crypto.go')
-rw-r--r--crypto/crypto.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 49793ded9..035d2ab80 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -261,6 +261,9 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error
passBytes := []byte(password)
derivedKey := pbkdf2.Key(passBytes, passBytes, 2000, 16, sha256.New)
plainText, err := aesCBCDecrypt(derivedKey, cipherText, iv)
+ if err != nil {
+ return nil, err
+ }
ethPriv := Sha3(plainText)
ecKey := ToECDSA(ethPriv)
key = &Key{
@@ -271,7 +274,7 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error
derivedAddr := hex.EncodeToString(key.Address.Bytes()) // needed because .Hex() gives leading "0x"
expectedAddr := preSaleKeyStruct.EthAddr
if derivedAddr != expectedAddr {
- err = errors.New(fmt.Sprintf("decrypted addr not equal to expected addr ", derivedAddr, expectedAddr))
+ err = fmt.Errorf("decrypted addr '%s' not equal to expected addr '%s'", derivedAddr, expectedAddr)
}
return key, err
}