foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
Code Issues Activity

random: add [[maybe_unused]] to GetDevURandom

Browse source 
Rather than multiple instances of (void)GetDevURandom to silence
compiler warnings.
This commit is contained in:
fanquake 2023-05-19 09:34:20 +01:00
parent c13c97dbf8
commit c2ba3f5b0c
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/random.cpp
View file

@ -251,7 +251,7 @@ static void Strengthen(const unsigned char (&seed)[32], SteadyClock::duration du
/** Fallback: get 32 bytes of system entropy from /dev/urandom. The most /** Fallback: get 32 bytes of system entropy from /dev/urandom. The most
* compatible way to get cryptographic randomness on UNIX-ish platforms. * compatible way to get cryptographic randomness on UNIX-ish platforms.
*/ */
static void GetDevURandom(unsigned char *ent32) [[maybe_unused]] static void GetDevURandom(unsigned char *ent32)
{ {
int f = open("/dev/urandom", O_RDONLY); int f = open("/dev/urandom", O_RDONLY);
if (f == -1) { if (f == -1) {
@ -310,14 +310,10 @@ void GetOSRand(unsigned char *ent32)
The function call is always successful. The function call is always successful.
*/ */
arc4random_buf(ent32, NUM_OS_RANDOM_BYTES); arc4random_buf(ent32, NUM_OS_RANDOM_BYTES);
// Silence a compiler warning about unused function.
(void)GetDevURandom;
#elif defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX) #elif defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX)
if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) { if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) {
RandFailure(); RandFailure();
} }
// Silence a compiler warning about unused function.
(void)GetDevURandom;
#elif defined(HAVE_SYSCTL_ARND) #elif defined(HAVE_SYSCTL_ARND)
/* FreeBSD, NetBSD and similar. It is possible for the call to return less /* FreeBSD, NetBSD and similar. It is possible for the call to return less
* bytes than requested, so need to read in a loop. * bytes than requested, so need to read in a loop.
@ -331,8 +327,6 @@ void GetOSRand(unsigned char *ent32)
} }
have += len; have += len;
} while (have < NUM_OS_RANDOM_BYTES); } while (have < NUM_OS_RANDOM_BYTES);
// Silence a compiler warning about unused function.
(void)GetDevURandom;
#else #else
/* Fall back to /dev/urandom if there is no specific method implemented to /* Fall back to /dev/urandom if there is no specific method implemented to
* get system entropy for this OS. * get system entropy for this OS.