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

Merge 977c00f48d into f7b9d0fdd4

pull/2000/merge
Arkadiusz Bokowy 2023-09-15 14:20:02 -06:00 committed by GitHub
parent f7b9d0fdd4 977c00f48d
commit 72220336ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -915,6 +915,9 @@ AC_CHECK_FUNCS([gettimeofday],
AC_CHECK_FUNCS([strptime], AC_CHECK_FUNCS([strptime],
[AM_CONDITIONAL([HAVE_STRPTIME], true)], [AM_CONDITIONAL([HAVE_STRPTIME], true)],
[AM_CONDITIONAL([HAVE_STRPTIME], false)]) [AM_CONDITIONAL([HAVE_STRPTIME], false)])
AC_CHECK_FUNCS([getentropy],
[AM_CONDITIONAL([HAVE_GETENTROPY], true)],
[AM_CONDITIONAL([HAVE_GETENTROPY], false)])
AC_CHECK_FUNCS([daemon], [have_daemon=yes]) AC_CHECK_FUNCS([daemon], [have_daemon=yes])
AM_CONDITIONAL([HAVE_DAEMON], [test "x$have_daemon" = "xyes"]) AM_CONDITIONAL([HAVE_DAEMON], [test "x$have_daemon" = "xyes"])

16
src/SimpleRandomizer.cc
View File

@ -106,6 +106,20 @@ void SimpleRandomizer::getRandomBytes(unsigned char* buf, size_t len)
auto iter = len / blocklen; auto iter = len / blocklen;
auto p = buf; auto p = buf;
#if !HAVE_GETENTROPY
auto getentropy = [this](void *buffer, size_t length) {
auto buf = reinterpret_cast<unsigned int*>(buffer);
auto dis = std::uniform_int_distribution<unsigned int>();
for (size_t q = length / sizeof(unsigned int); q > 0; --q, ++buf) {
*buf = dis(gen_);
}
const size_t r = length % sizeof(unsigned int);
auto last = dis(gen_);
memcpy(buf, &last, r);
return 0;
};
#endif // !HAVE_GETENTROPY
for (size_t i = 0; i < iter; ++i) { for (size_t i = 0; i < iter; ++i) {
auto rv = getentropy(p, blocklen); auto rv = getentropy(p, blocklen);
if (rv != 0) { if (rv != 0) {
@ -128,7 +142,7 @@ void SimpleRandomizer::getRandomBytes(unsigned char* buf, size_t len)
assert(0); assert(0);
abort(); abort();
} }
#endif // ! __MINGW32__ #endif // !__MINGW32__ && !__APPLE__
} }
} // namespace aria2 } // namespace aria2