mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-07-17 00:46:38 +02:00
commit bash-20200527 snapshot
This commit is contained in:
Chet Ramey
+4
-210
@@ -32,10 +32,6 @@
|
||||
# endif /* !__QNXNTO__ */
|
||||
#endif /* __QNX__ */
|
||||
|
||||
#if defined (HAVE_SYS_RANDOM_H)
|
||||
# include <sys/random.h>
|
||||
#endif
|
||||
|
||||
#if defined (HAVE_UNISTD_H)
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
@@ -206,19 +202,6 @@ static SHELL_VAR *assign_seconds PARAMS((SHELL_VAR *, char *, arrayind_t, char *
|
||||
static SHELL_VAR *get_seconds PARAMS((SHELL_VAR *));
|
||||
static SHELL_VAR *init_seconds_var PARAMS((void));
|
||||
|
||||
static u_bits32_t intrand32 PARAMS((u_bits32_t));
|
||||
static u_bits32_t genseed PARAMS((void));
|
||||
|
||||
static int brand PARAMS((void));
|
||||
static void sbrand PARAMS((unsigned long)); /* set bash random number generator. */
|
||||
static void seedrand PARAMS((void)); /* seed generator randomly */
|
||||
|
||||
static u_bits32_t brand32 PARAMS((void));
|
||||
static void sbrand32 PARAMS((u_bits32_t));
|
||||
static void seedrand32 PARAMS((void));
|
||||
static void perturb_rand32 PARAMS((void));
|
||||
static u_bits32_t get_urandom32 PARAMS((void));
|
||||
|
||||
static SHELL_VAR *assign_random PARAMS((SHELL_VAR *, char *, arrayind_t, char *));
|
||||
static SHELL_VAR *get_random PARAMS((SHELL_VAR *));
|
||||
|
||||
@@ -1348,201 +1331,12 @@ init_seconds_var ()
|
||||
INIT_DYNAMIC_VAR ("SECONDS", (v ? value_cell (v) : (char *)NULL), get_seconds, assign_seconds);
|
||||
return v;
|
||||
}
|
||||
|
||||
/* The random number seed. You can change this by setting RANDOM. */
|
||||
static u_bits32_t rseed = 1;
|
||||
static int last_random_value;
|
||||
|
||||
/* Functions for $RANDOM and $SRANDOM */
|
||||
|
||||
int last_random_value;
|
||||
static int seeded_subshell = 0;
|
||||
|
||||
/* Returns a 32-bit pseudo-random number. */
|
||||
static u_bits32_t
|
||||
intrand32 (last)
|
||||
u_bits32_t last;
|
||||
{
|
||||
/* Minimal Standard generator from
|
||||
"Random number generators: good ones are hard to find",
|
||||
Park and Miller, Communications of the ACM, vol. 31, no. 10,
|
||||
October 1988, p. 1195. filtered through FreeBSD.
|
||||
|
||||
x(n+1) = 16807 * x(n) mod (2**31 - 1).
|
||||
|
||||
We split up the calculations to avoid overflow.
|
||||
|
||||
h = last / q; l = x - h * q; t = a * l - h * r
|
||||
m = 2147483647, a = 16807, q = 127773, r = 2836
|
||||
|
||||
There are lots of other combinations of constants to use; look at
|
||||
https://www.gnu.org/software/gsl/manual/html_node/Other-random-number-generators.html#Other-random-number-generators */
|
||||
|
||||
bits32_t h, l, t;
|
||||
u_bits32_t ret;
|
||||
|
||||
/* Can't seed with 0. */
|
||||
ret = (last == 0) ? 123459876 : last;
|
||||
h = ret / 127773;
|
||||
l = ret - (127773 * h);
|
||||
t = 16807 * l - 2836 * h;
|
||||
ret = (t < 0) ? t + 0x7fffffff : t;
|
||||
|
||||
return (ret);
|
||||
}
|
||||
|
||||
static u_bits32_t
|
||||
genseed ()
|
||||
{
|
||||
struct timeval tv;
|
||||
u_bits32_t iv;
|
||||
|
||||
gettimeofday (&tv, NULL);
|
||||
iv = (u_bits32_t)seedrand; /* let the compiler truncate */
|
||||
iv = tv.tv_sec ^ tv.tv_usec ^ getpid () ^ getppid () ^ current_user.uid ^ iv;
|
||||
return (iv);
|
||||
}
|
||||
|
||||
#define BASH_RAND_MAX 32767 /* 0x7fff - 16 bits */
|
||||
|
||||
/* Returns a pseudo-random number between 0 and 32767. */
|
||||
static int
|
||||
brand ()
|
||||
{
|
||||
unsigned int ret;
|
||||
|
||||
rseed = intrand32 (rseed);
|
||||
if (shell_compatibility_level > 50)
|
||||
ret = (rseed >> 16) ^ (rseed & 65535);
|
||||
else
|
||||
ret = rseed;
|
||||
return (ret & BASH_RAND_MAX);
|
||||
}
|
||||
|
||||
/* Set the random number generator seed to SEED. */
|
||||
static void
|
||||
sbrand (seed)
|
||||
unsigned long seed;
|
||||
{
|
||||
rseed = seed;
|
||||
last_random_value = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
seedrand ()
|
||||
{
|
||||
u_bits32_t iv;
|
||||
|
||||
iv = genseed ();
|
||||
sbrand (iv);
|
||||
}
|
||||
|
||||
static u_bits32_t rseed32 = 1073741823;
|
||||
static int last_rand32;
|
||||
|
||||
static int urandfd = -1;
|
||||
|
||||
#define BASH_RAND32_MAX 0x7fffffff /* 32 bits */
|
||||
|
||||
/* Returns a 32-bit pseudo-random number between 0 and 4294967295. */
|
||||
static u_bits32_t
|
||||
brand32 ()
|
||||
{
|
||||
u_bits32_t ret;
|
||||
|
||||
rseed32 = intrand32 (rseed32);
|
||||
return (rseed32 & BASH_RAND32_MAX);
|
||||
}
|
||||
|
||||
static void
|
||||
sbrand32 (seed)
|
||||
u_bits32_t seed;
|
||||
{
|
||||
last_rand32 = rseed32 = seed;
|
||||
}
|
||||
|
||||
static void
|
||||
seedrand32 ()
|
||||
{
|
||||
u_bits32_t iv;
|
||||
|
||||
iv = genseed ();
|
||||
sbrand32 (iv);
|
||||
}
|
||||
|
||||
static void
|
||||
perturb_rand32 ()
|
||||
{
|
||||
rseed32 ^= genseed ();
|
||||
}
|
||||
|
||||
/* Force another attempt to open /dev/urandom on the next call to get_urandom32 */
|
||||
void
|
||||
urandom_close ()
|
||||
{
|
||||
if (urandfd >= 0)
|
||||
close (urandfd);
|
||||
urandfd = -1;
|
||||
}
|
||||
|
||||
#if !defined (HAVE_GETRANDOM)
|
||||
/* Imperfect emulation of getrandom(2). */
|
||||
#ifndef GRND_NONBLOCK
|
||||
# define GRND_NONBLOCK 1
|
||||
# define GRND_RANDOM 2
|
||||
#endif
|
||||
|
||||
static ssize_t
|
||||
getrandom (buf, len, flags)
|
||||
void *buf;
|
||||
size_t len;
|
||||
unsigned int flags;
|
||||
{
|
||||
int oflags;
|
||||
ssize_t r;
|
||||
static int urand_unavail = 0;
|
||||
|
||||
#if HAVE_GETENTROPY
|
||||
r = getentropy (buf, len);
|
||||
return (r == 0) ? len : -1;
|
||||
#endif
|
||||
|
||||
if (urandfd == -1 && urand_unavail == 0)
|
||||
{
|
||||
oflags = O_RDONLY;
|
||||
if (flags & GRND_NONBLOCK)
|
||||
oflags |= O_NONBLOCK;
|
||||
urandfd = open ("/dev/urandom", oflags, 0);
|
||||
if (urandfd >= 0)
|
||||
SET_CLOSE_ON_EXEC (urandfd);
|
||||
else
|
||||
{
|
||||
urand_unavail = 1;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
if (urandfd >= 0 && (r = read (urandfd, buf, len)) == len)
|
||||
return (r);
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
static u_bits32_t
|
||||
get_urandom32 ()
|
||||
{
|
||||
u_bits32_t ret;
|
||||
|
||||
if (getrandom ((void *)&ret, sizeof (ret), GRND_NONBLOCK) == sizeof (ret))
|
||||
return (last_rand32 = ret);
|
||||
|
||||
#if defined (HAVE_ARC4RANDOM)
|
||||
ret = arc4random ();
|
||||
#else
|
||||
if (subshell_environment)
|
||||
perturb_rand32 ();
|
||||
do
|
||||
ret = brand32 ();
|
||||
while (ret == last_rand32);
|
||||
#endif
|
||||
return (last_rand32 = ret);
|
||||
}
|
||||
|
||||
static SHELL_VAR *
|
||||
assign_random (self, value, unused, key)
|
||||
SHELL_VAR *self;
|
||||
|
||||
Reference in New Issue
Block a user