diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-19 12:00:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-19 12:09:26 +0100 |
| commit | 07f4386b387caddd82502d575cc9dba80b81d9f2 (patch) | |
| tree | 65727039c39354977ca8b9007ed9e395cb089586 /src/random.cpp | |
| parent | ea98509fa5f76fac581a1d016c42c2407065e48d (diff) | |
| parent | 1630219d906f592c9258bfe2a0e0c4923df35782 (diff) | |
Merge #5689: openssl: abstract out OPENSSL_cleanse
1630219 openssl: abstract out OPENSSL_cleanse (Cory Fields)
Diffstat (limited to 'src/random.cpp')
| -rw-r--r-- | src/random.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/random.cpp b/src/random.cpp index 663456e962..ae25bee1b7 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -5,6 +5,7 @@ #include "random.h" +#include "support/cleanse.h" #ifdef WIN32 #include "compat.h" // for Windows API #endif @@ -18,7 +19,6 @@ #include <sys/time.h> #endif -#include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/rand.h> @@ -40,7 +40,7 @@ void RandAddSeed() // Seed with CPU performance counter int64_t nCounter = GetPerformanceCounter(); RAND_add(&nCounter, sizeof(nCounter), 1.5); - OPENSSL_cleanse((void*)&nCounter, sizeof(nCounter)); + memory_cleanse((void*)&nCounter, sizeof(nCounter)); } void RandAddSeedPerfmon() @@ -70,7 +70,7 @@ void RandAddSeedPerfmon() RegCloseKey(HKEY_PERFORMANCE_DATA); if (ret == ERROR_SUCCESS) { RAND_add(begin_ptr(vData), nSize, nSize / 100.0); - OPENSSL_cleanse(begin_ptr(vData), nSize); + memory_cleanse(begin_ptr(vData), nSize); LogPrint("rand", "%s: %lu bytes\n", __func__, nSize); } else { static bool warned = false; // Warn only once |