diff options
| author | Luke Dashjr <[email protected]> | 2012-04-22 10:05:43 -0400 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-04-22 10:05:43 -0400 |
| commit | a93ab877877925c60b2dbf56bdde8aa46b6b7391 (patch) | |
| tree | 3c473dd4151e38a72763600839a16f4a3b509325 /src/crypter.cpp | |
| parent | Add missing breaks in optionmodel's switch case (diff) | |
| parent | Add missing includes. (Fix bulding under GCC 4.7) (diff) | |
| download | discoin-a93ab877877925c60b2dbf56bdde8aa46b6b7391.tar.xz discoin-a93ab877877925c60b2dbf56bdde8aa46b6b7391.zip | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/crypter.cpp')
| -rw-r--r-- | src/crypter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypter.cpp b/src/crypter.cpp index a374486c4..727cf090f 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -31,7 +31,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0], (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV); - if (i != WALLET_CRYPTO_KEY_SIZE) + if (i != (int)WALLET_CRYPTO_KEY_SIZE) { memset(&chKey, 0, sizeof chKey); memset(&chIV, 0, sizeof chIV); |