aboutsummaryrefslogtreecommitdiff
path: root/src/crypter.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <[email protected]>2012-08-12 17:22:59 +0000
committerLuke Dashjr <[email protected]>2012-08-12 17:22:59 +0000
commit92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25 (patch)
tree16335bc5d2d0fc03dfb38154b49233ad9b35f93d /src/crypter.cpp
parentMerge branch '0.6.0.x' into 0.6.x (diff)
parentBugfix: Fix a variety of misspellings (diff)
downloaddiscoin-92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25.tar.xz
discoin-92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25.zip
Merge branch '0.6.0.x' into 0.6.x
Diffstat (limited to 'src/crypter.cpp')
-rw-r--r--src/crypter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypter.cpp b/src/crypter.cpp
index 4f37575a6..411a1ee4c 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -17,7 +17,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
return false;
- // Try to keep the keydata out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
+ // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
// Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
// Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
mlock(&chKey[0], sizeof chKey);
@@ -44,7 +44,7 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigne
if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_KEY_SIZE)
return false;
- // Try to keep the keydata out of swap
+ // Try to keep the key data out of swap
// Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
// Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
mlock(&chKey[0], sizeof chKey);