highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-11 09:42:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.4.x' into 0.5.x

Browse Source 
Conflicts:
	src/main.cpp
This commit is contained in:
Luke Dashjr
2012-04-22 10:05:43 -04:00
parent e401e5eb79 d0fe14ffec
commit a93ab87787
16 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypter.cpp
View File

@@ -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);