diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-23 00:27:05 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-23 00:27:05 +0800 |
| commit | dce503779b2866d1d35b4582470604c0d7e156db (patch) | |
| tree | 7d8817ec84be38b911f967f1ecd5618d02e4caa9 /crypto/crypto.go | |
| parent | 58d0752fdd1c7363fb1a127cd7e0a86d7602be02 (diff) | |
| parent | 8b81ad1fc40080af441c0c6df94f0b2ea46e320b (diff) | |
| download | dexon-dce503779b2866d1d35b4582470604c0d7e156db.tar dexon-dce503779b2866d1d35b4582470604c0d7e156db.tar.gz dexon-dce503779b2866d1d35b4582470604c0d7e156db.tar.bz2 dexon-dce503779b2866d1d35b4582470604c0d7e156db.tar.lz dexon-dce503779b2866d1d35b4582470604c0d7e156db.tar.xz dexon-dce503779b2866d1d35b4582470604c0d7e156db.tar.zst dexon-dce503779b2866d1d35b4582470604c0d7e156db.zip | |
Merge pull request #1840 from ethersphere/console
console, cli, api fixes
Diffstat (limited to 'crypto/crypto.go')
| -rw-r--r-- | crypto/crypto.go | 5 |
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 } |