1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not try random devices immediately twice

Browse Source 
Do not retry `fill_random_bytes` in `Init_RandomSeedCore`, just after
it failed first.

In other places, `rand_init_default` and `random_seed`, no more tweeks
needed once it succeeded
This commit is contained in:
Nobuyoshi Nakada 2024-06-07 03:15:41 +09:00
parent 5b4734d51d
commit 335cb28886
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
random.c
View File

@ -131,8 +131,9 @@ typedef struct {
static VALUE rand_init(const rb_random_interface_t *, rb_random_t *, VALUE); static VALUE rand_init(const rb_random_interface_t *, rb_random_t *, VALUE);
static VALUE random_seed(VALUE); static VALUE random_seed(VALUE);
static void fill_random_seed(uint32_t *seed, size_t cnt); static void fill_random_seed(uint32_t *seed, size_t cnt, bool try_bytes);
static VALUE make_seed_value(uint32_t *ptr, size_t len); static VALUE make_seed_value(uint32_t *ptr, size_t len);
#define fill_random_bytes ruby_fill_random_bytes
RB_RANDOM_INTERFACE_DECLARE(rand_mt); RB_RANDOM_INTERFACE_DECLARE(rand_mt);
static const rb_random_interface_t random_mt_if = { static const rb_random_interface_t random_mt_if = {
@ -354,7 +355,7 @@ rand_init_default(const rb_random_interface_t *rng, rb_random_t *rnd)
size_t len = roomof(rng->default_seed_bits, 32); size_t len = roomof(rng->default_seed_bits, 32);
uint32_t *buf = ALLOCV_N(uint32_t, buf0, len+1); uint32_t *buf = ALLOCV_N(uint32_t, buf0, len+1);
fill_random_seed(buf, len); fill_random_seed(buf, len, true);
rng->init(rnd, buf, len); rng->init(rnd, buf, len);
seed = make_seed_value(buf, len); seed = make_seed_value(buf, len);
explicit_bzero(buf, len * sizeof(*buf)); explicit_bzero(buf, len * sizeof(*buf));
@ -677,11 +678,9 @@ ruby_fill_random_bytes(void *seed, size_t size, int need_secure)
return fill_random_bytes_urandom(seed, size); return fill_random_bytes_urandom(seed, size);
} }
#define fill_random_bytes ruby_fill_random_bytes
/* cnt must be 4 or more */ /* cnt must be 4 or more */
static void static void
fill_random_seed(uint32_t *seed, size_t cnt) fill_random_seed(uint32_t *seed, size_t cnt, bool try_bytes)
{ {
static rb_atomic_t n = 0; static rb_atomic_t n = 0;
#if defined HAVE_CLOCK_GETTIME #if defined HAVE_CLOCK_GETTIME
@ -691,10 +690,12 @@ fill_random_seed(uint32_t *seed, size_t cnt)
#endif #endif
size_t len = cnt * sizeof(*seed); size_t len = cnt * sizeof(*seed);
memset(seed, 0, len); if (try_bytes) {
fill_random_bytes(seed, len, FALSE); fill_random_bytes(seed, len, FALSE);
return;
}
memset(seed, 0, len);
#if defined HAVE_CLOCK_GETTIME #if defined HAVE_CLOCK_GETTIME
clock_gettime(CLOCK_REALTIME, &tv); clock_gettime(CLOCK_REALTIME, &tv);
seed[0] ^= tv.tv_nsec; seed[0] ^= tv.tv_nsec;
@ -729,8 +730,8 @@ make_seed_value(uint32_t *ptr, size_t len)
return seed; return seed;
} }
#define with_random_seed(size, add) \ #define with_random_seed(size, add, try_bytes) \
for (uint32_t seedbuf[(size)+(add)], loop = (fill_random_seed(seedbuf, (size)), 1); \ for (uint32_t seedbuf[(size)+(add)], loop = (fill_random_seed(seedbuf, (size), try_bytes), 1); \
loop; explicit_bzero(seedbuf, (size)*sizeof(seedbuf[0])), loop = 0) loop; explicit_bzero(seedbuf, (size)*sizeof(seedbuf[0])), loop = 0)
/* /*
@ -745,7 +746,7 @@ static VALUE
random_seed(VALUE _) random_seed(VALUE _)
{ {
VALUE v; VALUE v;
with_random_seed(DEFAULT_SEED_CNT, 1) { with_random_seed(DEFAULT_SEED_CNT, 1, true) {
v = make_seed_value(seedbuf, DEFAULT_SEED_CNT); v = make_seed_value(seedbuf, DEFAULT_SEED_CNT);
} }
return v; return v;
@ -1774,7 +1775,7 @@ Init_RandomSeedCore(void)
*/ */
struct MT mt; struct MT mt;
with_random_seed(DEFAULT_SEED_CNT, 0) { with_random_seed(DEFAULT_SEED_CNT, 0, false) {
init_by_array(&mt, seedbuf, DEFAULT_SEED_CNT); init_by_array(&mt, seedbuf, DEFAULT_SEED_CNT);
} }