nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-05-03 06:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkpasswd: refactoring

Browse Source
This commit is contained in:
Marco d'Itri 2017-12-10 16:54:03 +01:00
parent 41387e5837
commit 182fdaaaaa
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mkpasswd.c
View File

@ -360,7 +360,8 @@ int main(int argc, char *argv[])
exit(0); exit(0);
} }
#ifdef RANDOM_DEVICE #if defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF
void* get_random_bytes(const unsigned int count) void* get_random_bytes(const unsigned int count)
{ {
char *buf; char *buf;
@ -368,6 +369,9 @@ void* get_random_bytes(const unsigned int count)
ssize_t bytes_read; ssize_t bytes_read;
buf = NOFAIL(malloc(count)); buf = NOFAIL(malloc(count));
#if defined HAVE_ARC4RANDOM_BUF
arc4random_buf(buf, count);
#else
fd = open(RANDOM_DEVICE, O_RDONLY); fd = open(RANDOM_DEVICE, O_RDONLY);
if (fd < 0) { if (fd < 0) {
perror("open(" RANDOM_DEVICE ")"); perror("open(" RANDOM_DEVICE ")");
@ -383,24 +387,17 @@ void* get_random_bytes(const unsigned int count)
exit(2); exit(2);
} }
close(fd); close(fd);
#endif
return buf; return buf;
} }
#endif
#if defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF
void generate_salt(char *const buf, const unsigned int len) void generate_salt(char *const buf, const unsigned int len)
{ {
unsigned int i; unsigned int i;
unsigned char *entropy; unsigned char *entropy;
#if defined HAVE_ARC4RANDOM_BUF
entropy = NOFAIL(malloc(len));
arc4random_buf(entropy, len);
#else
entropy = get_random_bytes(len); entropy = get_random_bytes(len);
#endif
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
buf[i] = valid_salts[entropy[i] % (sizeof valid_salts - 1)]; buf[i] = valid_salts[entropy[i] % (sizeof valid_salts - 1)];