emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

passwd: shrink by ~10 bytes, use PRNG instead of usleep.

Browse Source
This commit is contained in:
Denis Vlasenko 2006-12-12 14:38:03 +00:00
parent 6f0540e7ec
commit 900406c359
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
loginutils/passwd.c
View File

@ -5,7 +5,6 @@
#include "busybox.h" #include "busybox.h"
#include <syslog.h> #include <syslog.h>
#include <sys/times.h> /* times() */
static void nuke_str(char *str) static void nuke_str(char *str)
@ -16,7 +15,8 @@ static void nuke_str(char *str)
static int i64c(int i) static int i64c(int i)
{ {
if (i <= 0) i &= 0x3f;
if (i == 0)
return '.'; return '.';
if (i == 1) if (i == 1)
return '/'; return '/';
@ -30,23 +30,16 @@ static int i64c(int i)
static void crypt_make_salt(char *p, int cnt) static void crypt_make_salt(char *p, int cnt)
{ {
#if !defined(__GLIBC__) unsigned x = x; /* it's pointless to initialize it anyway :) */
struct tms t;
#define TIMES times(&t)
#else
/* glibc allows for times(NULL) a-la time() */
#define TIMES times(NULL)
#endif
unsigned long x = x; /* it's pointless to initialize it anyway :) */
x += getpid(); x += getpid() + time(NULL) + clock();
do { do {
/* clock() and times() variability is different between systems */ /* x = (x*1664525 + 1013904223) mod 2^32 generator is lame
/* hopefully at least one is good enough */ * (low-order bit is not "random", etc...),
x += time(NULL) + clock() + TIMES; * but for our purposes it is good enough */
*p++ = i64c(((x >> 18) ^ (x >> 6)) & 0x3f); x = x*1664525 + 1013904223;
*p++ = i64c(((x >> 12) ^ x) & 0x3f); *p++ = i64c(x >> 16);
usleep(100); /* or else time() etc won't change */ *p++ = i64c(x >> 22);
} while (--cnt); } while (--cnt);
*p = '\0'; *p = '\0';
} }