github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-21 06:18:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.x' into 0.7.x

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
	src/crypter.h
	src/main.cpp
	src/qt/bitcoin.cpp
	src/qt/qtipcserver.cpp
	src/util.cpp
This commit is contained in:
Luke Dashjr
2012-11-14 21:32:36 +00:00
parent 2857d51fea f1a9aad789
commit c6911a9755
19 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.cpp
+1 -1
View File
@@ -155,7 +155,7 @@ void RandAddSeedPerfmon()
if (ret == ERROR_SUCCESS)
{
RAND_add(pdata, nSize, nSize/100.0);
memset(pdata, 0, nSize);
OPENSSL_cleanse(pdata, nSize);
printf("RandAddSeed() %lu bytes\n", nSize);
}
#endif