Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

more partial work on the wallet

Browse source
This commit is contained in:
Daniel Larimer 2015-07-22 18:37:00 -04:00
parent 8cab71c584
commit 8c0b1e86f7
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
programs/light_client/Wallet.cpp
View file

@ -131,9 +131,16 @@ bool Wallet::isLocked()const
if( !isOpen() ) return true; if( !isOpen() ) return true;
return false; return false;
} }
QString Wallet::unlock( QString password ) bool Wallet::unlock( QString password )
{ {
return QString(); if( !isLocked() ) return true;
auto pw_str = password.toStdString();
auto password_hash = fc::sha512::hash( pw_str.c_str(), pw_str.size() );
auto plain_txt = fc::aes_decrypt( password_hash, _data.encrypted_master_key );
_decrypted_master_key = fc::raw::unpack<fc::sha512>(plain_txt);
if( _data.master_key_digest != fc::sha512::hash(_decrypted_master_key) )
_decrypted_master_key = fc::sha512();
return !isLocked();
} }
bool Wallet::lock() bool Wallet::lock()
@ -146,7 +153,15 @@ bool Wallet::lock()
bool Wallet::changePassword( QString new_password ) bool Wallet::changePassword( QString new_password )
{ {
if( !isOpen() ) return false; if( !isOpen() ) return false;
return false; if( isLocked() ) return false;
auto pw_str = new_password.toStdString();
auto password_hash = fc::sha512::hash( pw_str.c_str(), pw_str.size() );
_data.encrypted_master_key = fc::aes_encrypt( password_hash, fc::raw::pack(_decrypted_master_key) );
save();
return true;
} }
QString Wallet::getActivePrivateKey( QString owner_pub_key, uint32_t seq ) QString Wallet::getActivePrivateKey( QString owner_pub_key, uint32_t seq )

8
programs/light_client/Wallet.hpp
View file

@ -68,10 +68,10 @@ class Wallet : public QObject
/** @pre hasBrainKey() */ /** @pre hasBrainKey() */
Q_INVOKABLE QString getBrainKey(); Q_INVOKABLE QString getBrainKey();
Q_INVOKABLE bool isLocked()const; Q_INVOKABLE bool isLocked()const;
Q_INVOKABLE QString unlock( QString password ); Q_INVOKABLE bool unlock( QString password );
Q_INVOKABLE bool lock(); Q_INVOKABLE bool lock();
Q_INVOKABLE bool changePassword( QString new_password ); Q_INVOKABLE bool changePassword( QString new_password );
/** /**
* @pre !isLocked(); * @pre !isLocked();