nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-08-31 07:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkpasswd: use getentropy(2) on recent Linux

Browse Source
This commit is contained in:
Marco d'Itri 2017-12-10 17:04:36 +01:00
parent 182fdaaaaa
commit 6557a52b3e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.h
View File

@ -94,6 +94,11 @@
# undef RANDOM_DEVICE
#endif
/* or else getentropy(2) on Linux */
#if defined __GLIBC__ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 25
# define HAVE_GETENTROPY
#endif
#ifdef ENABLE_NLS
# ifndef NLS_CAT_NAME
# define NLS_CAT_NAME "whois"

9
mkpasswd.c
View File

@ -360,7 +360,7 @@ int main(int argc, char *argv[])
exit(0);
}
#if defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF
#if defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF || defined HAVE_GETENTROPY
void* get_random_bytes(const unsigned int count)
{
@ -371,6 +371,9 @@ void* get_random_bytes(const unsigned int count)
buf = NOFAIL(malloc(count));
#if defined HAVE_ARC4RANDOM_BUF
arc4random_buf(buf, count);
#elif defined HAVE_GETENTROPY
if (getentropy(buf, count) < 0)
perror("getentropy");
#else
fd = open(RANDOM_DEVICE, O_RDONLY);
if (fd < 0) {
@ -405,7 +408,7 @@ void generate_salt(char *const buf, const unsigned int len)
free(entropy);
}
#else /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */
#else /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF || HAVE_GETENTROPY */
void generate_salt(char *const buf, const unsigned int len)
{
@ -433,7 +436,7 @@ void generate_salt(char *const buf, const unsigned int len)
buf[i] = '\0';
}
#endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */
#endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF || HAVE_GETENTROPY*/
void NORETURN display_help(int error)
{