e/frandom: totally remove it

Revert "random: sprinkle e/f/prandom in places that deplete entropy often"

This reverts commit ec5cbbc97e67e34343508179d56058309baabbf9.

Revert "random32: use e/frandom for reseeding, and a merge fixup"

This reverts commit d3d3c80eb781a34798671522c8745efc70afd0bd.

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/random32.c b/lib/random32.c
index dc75dc59b..6056fdc02 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -152,7 +152,8 @@ static u32 __extract_hwseed(void)
 {
 	unsigned int val = 0;
 
-	(void)(arch_get_random_int(&val));
+	(void)(arch_get_random_seed_int(&val) ||
+	       arch_get_random_int(&val));
 
 	return val;
 }
@@ -221,7 +222,7 @@ static void __prandom_timer(unsigned long dontcare)
 	u32 entropy;
 	unsigned long expires;
 
-	erandom_get_random_bytes((char *)&entropy, sizeof(entropy));
+	get_random_bytes(&entropy, sizeof(entropy));
 	prandom_seed(entropy);
 
 	/* reseed every ~60 seconds, in [40 .. 80) interval with slack */
@@ -271,7 +272,7 @@ static void __prandom_reseed(bool late)
 		struct rnd_state *state = &per_cpu(net_rand_state,i);
 		u32 seeds[4];
 
-		erandom_get_random_bytes((char *)&seeds, sizeof(seeds));
+		get_random_bytes(&seeds, sizeof(seeds));
 		state->s1 = __seed(seeds[0],   2U);
 		state->s2 = __seed(seeds[1],   8U);
 		state->s3 = __seed(seeds[2],  16U);