LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Encapsulate RNGState better

Browse source
This commit is contained in:
Pieter Wuille 2019-01-10 18:19:50 -08:00
parent 152146e782
commit cddb31bb0a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/random.cpp
View file

@ -278,13 +278,14 @@ void LockingCallbackOpenSSL(int mode, int i, const char* file, int line);
namespace {
struct RNGState {
class RNGState {
Mutex m_mutex;
unsigned char m_state[32] GUARDED_BY(m_mutex) = {0};
uint64_t m_counter GUARDED_BY(m_mutex) = 0;
bool m_strongly_seeded GUARDED_BY(m_mutex) = false;
std::unique_ptr<Mutex[]> m_mutex_openssl;
public:
RNGState() noexcept
{
InitHardwareRand();
@ -342,6 +343,8 @@ struct RNGState {
memory_cleanse(buf, 64);
return ret;
}
Mutex& GetOpenSSLMutex(int i) { return m_mutex_openssl[i]; }
};
RNGState& GetRNGState() noexcept
@ -358,9 +361,9 @@ void LockingCallbackOpenSSL(int mode, int i, const char* file, int line) NO_THRE
RNGState& rng = GetRNGState();
if (mode & CRYPTO_LOCK) {
rng.m_mutex_openssl[i].lock();
rng.GetOpenSSLMutex(i).lock();
} else {
rng.m_mutex_openssl[i].unlock();
rng.GetOpenSSLMutex(i).unlock();
}
}