Auto merge of #1681 - paragonie-scott:patch-1, r=str4d

[VerusCoin.git] / src / random.cpp

diff --git a/src/random.cpp b/src/random.cpp
index 998e7dfb08a035dc5b70ade9b91b129dbfc996de..4f197fcac1d83eb9d4f3bf12c7945f15a200da54 100644 (file)
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -1,10 +1,11 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2010 Satoshi Nakamoto

-// Copyright (c) 2009-2014 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
+// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying

 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "random.h"
 
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "random.h"
 

+#include "support/cleanse.h"

 #ifdef WIN32
 #include "compat.h" // for Windows API
 #endif
 #ifdef WIN32
 #include "compat.h" // for Windows API
 #endif


@@ -18,7 +19,6 @@
 #include <sys/time.h>
 #endif
 
 #include <sys/time.h>
 #endif
 

-#include <openssl/crypto.h>

 #include <openssl/err.h>
 #include <openssl/rand.h>
 
 #include <openssl/err.h>
 #include <openssl/rand.h>
 


@@ -40,22 +40,23 @@ void RandAddSeed()
     // Seed with CPU performance counter
     int64_t nCounter = GetPerformanceCounter();
     RAND_add(&nCounter, sizeof(nCounter), 1.5);
     // 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()
 {
     RandAddSeed();
 
 }
 
 void RandAddSeedPerfmon()
 {
     RandAddSeed();
 

+#ifdef WIN32
+    // Don't need this on Linux, OpenSSL automatically uses /dev/urandom
+    // Seed with the entire set of perfmon data
+

     // This can take up to 2 seconds, so only do it every 10 minutes
     static int64_t nLastPerfmon;
     if (GetTime() < nLastPerfmon + 10 * 60)
         return;
     nLastPerfmon = GetTime();
 
     // This can take up to 2 seconds, so only do it every 10 minutes
     static int64_t nLastPerfmon;
     if (GetTime() < nLastPerfmon + 10 * 60)
         return;
     nLastPerfmon = GetTime();
 

-#ifdef WIN32
-    // Don't need this on Linux, OpenSSL automatically uses /dev/urandom
-    // Seed with the entire set of perfmon data

     std::vector<unsigned char> vData(250000, 0);
     long ret = 0;
     unsigned long nSize = 0;
     std::vector<unsigned char> vData(250000, 0);
     long ret = 0;
     unsigned long nSize = 0;


@@ -70,7 +71,7 @@ void RandAddSeedPerfmon()
     RegCloseKey(HKEY_PERFORMANCE_DATA);
     if (ret == ERROR_SUCCESS) {
         RAND_add(begin_ptr(vData), nSize, nSize / 100.0);
     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
         LogPrint("rand", "%s: %lu bytes\n", __func__, nSize);
     } else {
         static bool warned = false; // Warn only once


@@ -82,13 +83,12 @@ void RandAddSeedPerfmon()
 #endif
 }
 
 #endif
 }
 

-bool GetRandBytes(unsigned char* buf, int num)
+void GetRandBytes(unsigned char* buf, int num)

 {
     if (RAND_bytes(buf, num) != 1) {
         LogPrintf("%s: OpenSSL RAND_bytes() failed with error: %s\n", __func__, ERR_error_string(ERR_get_error(), NULL));
 {
     if (RAND_bytes(buf, num) != 1) {
         LogPrintf("%s: OpenSSL RAND_bytes() failed with error: %s\n", __func__, ERR_error_string(ERR_get_error(), NULL));

-        return false;
+        assert(false);

     }
     }

-    return true;

 }
 
 uint64_t GetRand(uint64_t nMax)
 }
 
 uint64_t GetRand(uint64_t nMax)


@@ -137,3 +137,8 @@ void seed_insecure_rand(bool fDeterministic)
         insecure_rand_Rw = tmp;
     }
 }
         insecure_rand_Rw = tmp;
     }
 }

+
+int GenIdentity(int n)
+{
+    return n-1;
+}