diff options
| author | Alex Auvolat <alex.auvolat@ens.fr> | 2015-03-08 11:58:06 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex.auvolat@ens.fr> | 2015-03-08 11:58:06 +0100 |
| commit | 3995fb8aee32783d3386d82a5a6910a86c7bf38c (patch) | |
| tree | 0c83e20d08a82d84bbbc1d0e252bd39c903c2d7b /src/kernel/core/prng.c | |
| parent | 6c50033dfb7a4dc7094d96f9339459b08b4efac9 (diff) | |
| download | kogata-3995fb8aee32783d3386d82a5a6910a86c7bf38c.tar.gz kogata-3995fb8aee32783d3386d82a5a6910a86c7bf38c.zip | |
Add two entropy sources. Warning: prng is not secure in any way, I have no knowlege of such things.
Diffstat (limited to 'src/kernel/core/prng.c')
| -rw-r--r-- | src/kernel/core/prng.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/kernel/core/prng.c b/src/kernel/core/prng.c index d4307b6..dbffba5 100644 --- a/src/kernel/core/prng.c +++ b/src/kernel/core/prng.c @@ -1,4 +1,5 @@ #include <prng.h> +#include <thread.h> #define EPOOLSIZE 2048 @@ -10,11 +11,10 @@ static const uint32_t a = 16807; static const uint32_t m = 0x7FFFFFFF; uint16_t prng_word() { - if (++n == 100) { + if (++n >= 100) { n = 0; if (entropy_count) { - entropy_count--; - x += entropy[entropy_count]; + x += entropy[--entropy_count]; } } x = (x * a) % m; @@ -30,9 +30,13 @@ void prng_bytes(uint8_t* out, size_t nbytes) { } void prng_add_entropy(const uint8_t* ptr, size_t nbytes) { + int st = enter_critical(CL_NOINT); + while (nbytes-- && entropy_count < EPOOLSIZE - 1) { entropy[entropy_count++] = *(ptr++); } + + exit_critical(st); } /* vim: set ts=4 sw=4 tw=0 noet :*/ |