LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Return meaningful errors for locked wallets.

Browse source 
This change adds a check for a valid (32-byte length) secret before
attempting to encrypt or decrypt any addresses.  If the check fails, a
meaningful error (ErrWalletLocked) is returned to the caller, rather
than an error out of the aes package.
This commit is contained in:
Josh Rickmar 2014-01-17 10:29:44 -05:00
parent 97e1442e8d
commit 54355f16e7
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wallet/wallet.go
View file

@ -885,6 +885,9 @@ func (w *Wallet) extendKeypool(n uint, bs *BlockStamp) error {
if !ok { if !ok {
return errors.New("expected last chained address not found") return errors.New("expected last chained address not found")
} }
if len(w.secret) != 32 {
return ErrWalletLocked
}
privkey, err := addr.unlock(w.secret) privkey, err := addr.unlock(w.secret)
if err != nil { if err != nil {
return err return err
@ -971,6 +974,9 @@ func (w *Wallet) createMissingPrivateKeys() error {
return errors.New("missing previous chained address") return errors.New("missing previous chained address")
} }
prevAddr := w.addrMap[*apkh] prevAddr := w.addrMap[*apkh]
if len(w.secret) != 32 {
return ErrWalletLocked
}
prevPrivKey, err := prevAddr.unlock(w.secret) prevPrivKey, err := prevAddr.unlock(w.secret)
if err != nil { if err != nil {
return err return err