aboutsummaryrefslogtreecommitdiff
path: root/src/crypter.cpp
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2011-11-26 06:02:04 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2011-12-20 18:42:30 -0500
commit96f1723bb1f4155357b4e33988a2b99ee674c549 (patch)
treef21c2b656be1b5b1b95f03ad01856b472c71dab2 /src/crypter.cpp
parentf503a1486a6cbda8d0e73923fec8de3ced253b28 (diff)
downloadbitcoin-96f1723bb1f4155357b4e33988a2b99ee674c549.tar.xz
Implement an mlock()'d string class for storing passphrases
SecureString is identical to std::string except with secure_allocator substituting for std::allocator. This makes casting between them impossible, so converting between the two at API boundaries requires calling ::c_str() for now.
Diffstat (limited to 'src/crypter.cpp')
-rw-r--r--src/crypter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypter.cpp b/src/crypter.cpp
index bee7a3624b..7f53e22f1e 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -15,7 +15,7 @@
#include "main.h"
#include "util.h"
-bool CCrypter::SetKeyFromPassphrase(const std::string& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod)
+bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod)
{
if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
return false;