diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:07:24 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:07:24 -0400 |
| commit | 66116c3847eeb3f0619bc084d96f5add41a156c8 (patch) | |
| tree | 8952b665662e18fd4a1b6ffd5f99a39adab8d92d /src/crypter.cpp | |
| parent | c43a9ea77db06b9d101f0551df373d417e5028af (diff) | |
| parent | a93ab877877925c60b2dbf56bdde8aa46b6b7391 (diff) | |
| download | bitcoin-66116c3847eeb3f0619bc084d96f5add41a156c8.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/util.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 83041addb4..2501305edc 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); |