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/crypter.h | |
| 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/crypter.h')
| -rw-r--r-- | src/crypter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypter.h b/src/crypter.h index e8ca30a8cc..d7f8a39d83 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -65,7 +65,7 @@ private: bool fKeySet; public: - bool SetKeyFromPassphrase(const std::string &strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod); + bool SetKeyFromPassphrase(const SecureString &strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod); bool Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext); bool Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext); bool SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigned char>& chNewIV); |