diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-30 17:30:54 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-30 17:30:54 -0800 |
| commit | a7120a3647b17878914da0b40655edcc5a9da59f (patch) | |
| tree | e196c290b626a69452dd1f1932ec7bb52cd148f0 /src/qt/walletmodel.cpp | |
| parent | 0305f60cadf96509fa212071eb6bc06f31e9f001 (diff) | |
| parent | 94f778bdebe1438fbe0206621ce44b4e25196e59 (diff) | |
| download | bitcoin-a7120a3647b17878914da0b40655edcc5a9da59f.tar.xz | |
Merge pull request #666 from nobled/secstrings
Implement an mlock()'d string class for storing passphrases
Diffstat (limited to 'src/qt/walletmodel.cpp')
| -rw-r--r-- | src/qt/walletmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 2f989661f0..f028f10f6c 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -200,7 +200,7 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const } } -bool WalletModel::setWalletEncrypted(bool encrypted, const std::string &passphrase) +bool WalletModel::setWalletEncrypted(bool encrypted, const SecureString &passphrase) { if(encrypted) { @@ -214,7 +214,7 @@ bool WalletModel::setWalletEncrypted(bool encrypted, const std::string &passphra } } -bool WalletModel::setWalletLocked(bool locked, const std::string &passPhrase) +bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase) { if(locked) { @@ -228,7 +228,7 @@ bool WalletModel::setWalletLocked(bool locked, const std::string &passPhrase) } } -bool WalletModel::changePassphrase(const std::string &oldPass, const std::string &newPass) +bool WalletModel::changePassphrase(const SecureString &oldPass, const SecureString &newPass) { bool retval; CRITICAL_BLOCK(wallet->cs_wallet) |