Browse Source

Maintain state across GetStrongRandBytes calls

0.15
Pieter Wuille 8 years ago
parent
commit
97477c537e
  1. 17
      src/random.cpp

17
src/random.cpp

@ -32,6 +32,8 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#include <mutex>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/rand.h> #include <openssl/rand.h>
@ -192,6 +194,10 @@ void GetRandBytes(unsigned char* buf, int num)
} }
} }
static std::mutex cs_rng_state;
static unsigned char rng_state[32] = {0};
static uint64_t rng_counter = 0;
void GetStrongRandBytes(unsigned char* out, int num) void GetStrongRandBytes(unsigned char* out, int num)
{ {
assert(num <= 32); assert(num <= 32);
@ -207,8 +213,17 @@ void GetStrongRandBytes(unsigned char* out, int num)
GetOSRand(buf); GetOSRand(buf);
hasher.Write(buf, 32); hasher.Write(buf, 32);
// Produce output // Combine with and update state
{
std::unique_lock<std::mutex> lock(cs_rng_state);
hasher.Write(rng_state, sizeof(rng_state));
hasher.Write((const unsigned char*)&rng_counter, sizeof(rng_counter));
++rng_counter;
hasher.Finalize(buf); hasher.Finalize(buf);
memcpy(rng_state, buf + 32, 32);
}
// Produce output
memcpy(out, buf, num); memcpy(out, buf, num);
memory_cleanse(buf, 64); memory_cleanse(buf, 64);
} }

Loading…
Cancel
Save