aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.2343: using time() for srand() is not very random

Browse Source 
Problem:    Using time() for srand() is not very random.
Solution:   use /dev/urandom if available
This commit is contained in:
Bram Moolenaar 2019-11-26 12:23:30 +01:00
parent 06b0b4bc27
commit 07e4a19795
3 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/evalfunc.c
View File

@ -7095,10 +7095,45 @@ f_sqrt(typval_T *argvars, typval_T *rettv)
static void static void
f_srand(typval_T *argvars, typval_T *rettv) f_srand(typval_T *argvars, typval_T *rettv)
{ {
static int dev_urandom_state = -1; // FAIL or OK once tried
if (rettv_list_alloc(rettv) == FAIL) if (rettv_list_alloc(rettv) == FAIL)
return; return;
if (argvars[0].v_type == VAR_UNKNOWN) if (argvars[0].v_type == VAR_UNKNOWN)
list_append_number(rettv->vval.v_list, (varnumber_T)vim_time()); {
if (dev_urandom_state != FAIL)
{
int fd = open("/dev/urandom", O_RDONLY);
struct {
union {
UINT32_T number;
char bytes[sizeof(UINT32_T)];
} cont;
} buf;
// Attempt reading /dev/urandom.
if (fd == -1)
dev_urandom_state = FAIL;
else
{
buf.cont.number = 0;
if (read(fd, buf.cont.bytes, sizeof(UINT32_T))
!= sizeof(UINT32_T))
dev_urandom_state = FAIL;
else
{
dev_urandom_state = OK;
list_append_number(rettv->vval.v_list,
(varnumber_T)buf.cont.number);
}
close(fd);
}
}
if (dev_urandom_state != OK)
// Reading /dev/urandom doesn't work, fall back to time().
list_append_number(rettv->vval.v_list, (varnumber_T)vim_time());
}
else else
{ {
int error = FALSE; int error = FALSE;
@ -7107,7 +7142,7 @@ f_srand(typval_T *argvars, typval_T *rettv)
if (error) if (error)
return; return;
list_append_number(rettv->vval.v_list, x); list_append_number(rettv->vval.v_list, (varnumber_T)x);
} }
list_append_number(rettv->vval.v_list, 362436069); list_append_number(rettv->vval.v_list, 362436069);
list_append_number(rettv->vval.v_list, 521288629); list_append_number(rettv->vval.v_list, 521288629);

14
src/testdir/test_random.vim
View File

@ -11,9 +11,15 @@ func Test_Rand()
call test_settime(12341234) call test_settime(12341234)
let s = srand() let s = srand()
call assert_equal(s, srand()) if filereadable('/dev/urandom')
call test_settime(12341235) " using /dev/urandom
call assert_notequal(s, srand()) call assert_notequal(s, srand())
else
" using time()
call assert_equal(s, srand())
call test_settime(12341235)
call assert_notequal(s, srand())
endif
call srand() call srand()
let v = rand() let v = rand()
@ -25,4 +31,6 @@ func Test_Rand()
call assert_fails('echo rand([1, [2], 3, 4])', 'E475:') call assert_fails('echo rand([1, [2], 3, 4])', 'E475:')
call assert_fails('echo rand([1, 2, [3], 4])', 'E475:') call assert_fails('echo rand([1, 2, [3], 4])', 'E475:')
call assert_fails('echo rand([1, 2, 3, [4]])', 'E475:') call assert_fails('echo rand([1, 2, 3, [4]])', 'E475:')
call test_settime(0)
endfunc endfunc

2
src/version.c
View File

@ -737,6 +737,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2343,
/**/ /**/
2342, 2342,
/**/ /**/