From f77f040e8c33eb98d56d519e687fba6226f57ad1 Mon Sep 17 00:00:00 2001 From: Matt Mackall Date: Tue, 29 May 2007 21:54:27 -0500 Subject: [PATCH] --- yaml --- r: 57090 b: refs/heads/master c: 602b6aeefe8932dd8bb15014e8fe6bb25d736361 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/random.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7991ec0fae26..c411b5ca5e33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f717221b4e51284c153ab4265c4607e86037047b +refs/heads/master: 602b6aeefe8932dd8bb15014e8fe6bb25d736361 diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c index 46c1b97748b6..9705b439448a 100644 --- a/trunk/drivers/char/random.c +++ b/trunk/drivers/char/random.c @@ -760,7 +760,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, static void extract_buf(struct entropy_store *r, __u8 *out) { - int i, x; + int i; __u32 data[16], buf[5 + SHA_WORKSPACE_WORDS]; sha_init(buf); @@ -772,9 +772,11 @@ static void extract_buf(struct entropy_store *r, __u8 *out) * attempts to find previous ouputs), unless the hash * function can be inverted. */ - for (i = 0, x = 0; i < r->poolinfo->poolwords; i += 16, x+=2) { - sha_transform(buf, (__u8 *)r->pool+i, buf + 5); - add_entropy_words(r, &buf[x % 5], 1); + for (i = 0; i < r->poolinfo->poolwords; i += 16) { + /* hash blocks of 16 words = 512 bits */ + sha_transform(buf, (__u8 *)(r->pool + i), buf + 5); + /* feed back portion of the resulting hash */ + add_entropy_words(r, &buf[i % 5], 1); } /* @@ -782,7 +784,7 @@ static void extract_buf(struct entropy_store *r, __u8 *out) * portion of the pool while mixing, and hash one * final time. */ - __add_entropy_words(r, &buf[x % 5], 1, data); + __add_entropy_words(r, &buf[i % 5], 1, data); sha_transform(buf, (__u8 *)data, buf + 5); /*