random32: add prandom_reseed_late() and call when nonblocking pool becomes initialized

[~andy/linux] / include / linux / random.h

diff --git a/include/linux/random.h b/include/linux/random.h
index 3b9377d6b7a5fd63b13d02fc238d7da99fbef026..5117ae348fe803053ca416419aa006637b906e85 100644 (file)
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -17,6 +17,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags);
 extern void get_random_bytes(void *buf, int nbytes);
 extern void get_random_bytes_arch(void *buf, int nbytes);
 void generate_random_uuid(unsigned char uuid_out[16]);
+extern int random_int_secret_init(void);
 
 #ifndef MODULE
 extern const struct file_operations random_fops, urandom_fops;
@@ -28,6 +29,7 @@ unsigned long randomize_range(unsigned long start, unsigned long end, unsigned l
 u32 prandom_u32(void);
 void prandom_bytes(void *buf, int nbytes);
 void prandom_seed(u32 seed);
+void prandom_reseed_late(void);
 
 u32 prandom_u32_state(struct rnd_state *);
 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
@@ -49,9 +51,9 @@ static inline void prandom_seed_state(struct rnd_state *state, u64 seed)
 {
        u32 i = (seed >> 32) ^ (seed << 10) ^ seed;
 
-       state->s1 = __seed(i, 1);
-       state->s2 = __seed(i, 7);
-       state->s3 = __seed(i, 15);
+       state->s1 = __seed(i, 2);
+       state->s2 = __seed(i, 8);
+       state->s3 = __seed(i, 16);
 }
 
 #ifdef CONFIG_ARCH_RANDOM