github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't use std::random_device directly as suggested by document 

See http://en.cppreference.com/w/cpp/numeric/random/random_device
pull/538/head
Tatsuhiro Tsujikawa 2016-01-17 17:30:36 +09:00
parent 0282899bfa
commit 9b41970134
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SimpleRandomizer.cc
View File

@ -63,7 +63,11 @@ const std::unique_ptr<SimpleRandomizer>& SimpleRandomizer::getInstance()
return randomizer_; return randomizer_;
} }
SimpleRandomizer::SimpleRandomizer() namespace {
std::random_device rd;
} // namespace
SimpleRandomizer::SimpleRandomizer() : gen_(rd())
{ {
#ifdef __MINGW32__ #ifdef __MINGW32__
BOOL r = ::CryptAcquireContext(&provider_, 0, 0, PROV_RSA_FULL, BOOL r = ::CryptAcquireContext(&provider_, 0, 0, PROV_RSA_FULL,
@ -120,12 +124,12 @@ void SimpleRandomizer::getRandomBytes(unsigned char* buf, size_t len)
#endif // defined(HAVE_GETRANDOM_INTERFACE) #endif // defined(HAVE_GETRANDOM_INTERFACE)
auto ubuf = reinterpret_cast<result_type*>(buf); auto ubuf = reinterpret_cast<result_type*>(buf);
size_t q = len / sizeof(result_type); size_t q = len / sizeof(result_type);
auto gen = std::uniform_int_distribution<result_type>(); auto dis = std::uniform_int_distribution<result_type>();
for (; q > 0; --q, ++ubuf) { for (; q > 0; --q, ++ubuf) {
*ubuf = gen(dev_); *ubuf = dis(gen_);
} }
const size_t r = len % sizeof(result_type); const size_t r = len % sizeof(result_type);
auto last = gen(dev_); auto last = dis(gen_);
memcpy(ubuf, &last, r); memcpy(ubuf, &last, r);
#endif // ! __MINGW32__ #endif // ! __MINGW32__
} }

4
src/SimpleRandomizer.h
View File

@ -55,11 +55,11 @@ private:
#ifdef __MINGW32__ #ifdef __MINGW32__
HCRYPTPROV provider_; HCRYPTPROV provider_;
#else #else
std::random_device dev_; std::mt19937 gen_;
#endif // ! __MINGW32__ #endif // ! __MINGW32__
public: public:
typedef std::random_device::result_type result_type; typedef std::mt19937::result_type result_type;
static const std::unique_ptr<SimpleRandomizer>& getInstance(); static const std::unique_ptr<SimpleRandomizer>& getInstance();