kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

random.c: fill_random_seed size

Browse source 
* random.c (fill_random_seed): move the seed size to an argument.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-05-13 15:16:56 +00:00
parent 678c39dc44
commit 79850a0829
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
random.c
View file

@ -543,14 +543,15 @@ fill_random_bytes(void *seed, size_t size, int need_secure)
} }
static void static void
fill_random_seed(uint32_t seed[DEFAULT_SEED_CNT]) fill_random_seed(uint32_t *seed, size_t cnt)
{ {
static int n = 0; static int n = 0;
struct timeval tv; struct timeval tv;
size_t len = cnt * sizeof(*seed);
memset(seed, 0, DEFAULT_SEED_LEN); memset(seed, 0, len);
fill_random_bytes(seed, DEFAULT_SEED_LEN, TRUE); fill_random_bytes(seed, len, TRUE);
gettimeofday(&tv, 0); gettimeofday(&tv, 0);
seed[0] ^= tv.tv_usec; seed[0] ^= tv.tv_usec;
@ -602,7 +603,7 @@ random_seed(void)
{ {
VALUE v; VALUE v;
uint32_t buf[DEFAULT_SEED_CNT]; uint32_t buf[DEFAULT_SEED_CNT];
fill_random_seed(buf); fill_random_seed(buf, DEFAULT_SEED_CNT);
v = make_seed_value(buf); v = make_seed_value(buf);
explicit_bzero(buf, DEFAULT_SEED_LEN); explicit_bzero(buf, DEFAULT_SEED_LEN);
return v; return v;
@ -1540,7 +1541,7 @@ Init_RandomSeedCore(void)
struct MT mt; struct MT mt;
uint32_t initial_seed[DEFAULT_SEED_CNT]; uint32_t initial_seed[DEFAULT_SEED_CNT];
fill_random_seed(initial_seed); fill_random_seed(initial_seed, DEFAULT_SEED_CNT);
init_by_array(&mt, initial_seed, DEFAULT_SEED_CNT); init_by_array(&mt, initial_seed, DEFAULT_SEED_CNT);
init_hashseed(&mt); init_hashseed(&mt);
@ -1555,7 +1556,7 @@ init_randomseed(struct MT *mt)
uint32_t initial[DEFAULT_SEED_CNT]; uint32_t initial[DEFAULT_SEED_CNT];
VALUE seed; VALUE seed;
fill_random_seed(initial); fill_random_seed(initial, DEFAULT_SEED_CNT);
init_by_array(mt, initial, DEFAULT_SEED_CNT); init_by_array(mt, initial, DEFAULT_SEED_CNT);
seed = make_seed_value(initial); seed = make_seed_value(initial);
explicit_bzero(initial, DEFAULT_SEED_LEN); explicit_bzero(initial, DEFAULT_SEED_LEN);