diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-11 09:08:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-11 09:08:47 -0800 |
| commit | 84c37c168c0e49a412d7021cda3183a72adac0d0 (patch) | |
| tree | 2a50857925f3b89c9b5b3b0cc7e2e7f485a95b50 /init/main.c | |
| parent | 434fd6353b4c83938029ca6ea7dfa4fc82d602bd (diff) | |
| parent | db61ffe3a71c697aaa91c42c862a5f7557a0e562 (diff) | |
| download | linux-84c37c168c0e49a412d7021cda3183a72adac0d0.tar.gz linux-84c37c168c0e49a412d7021cda3183a72adac0d0.tar.bz2 linux-84c37c168c0e49a412d7021cda3183a72adac0d0.zip | |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull random updates from Ted Ts'o:
"Change get_random_{int,log} to use the CRNG used by /dev/urandom and
getrandom(2). It's faster and arguably more secure than cut-down MD5
that we had been using.
Also do some code cleanup"
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block
random: convert get_random_int/long into get_random_u32/u64
random: use chacha20 for get_random_int/long
random: fix comment for unused random_min_urandom_seed
random: remove variable limit
random: remove stale urandom_init_wait
random: remove stale maybe_reseed_primary_crng
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index eae2f15657c6..f9c9d9948203 100644 --- a/init/main.c +++ b/init/main.c @@ -882,7 +882,6 @@ static void __init do_basic_setup(void) do_ctors(); usermodehelper_enable(); do_initcalls(); - random_int_secret_init(); } static void __init do_pre_smp_initcalls(void) |