From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 8 Oct 2001 20:46:54 +0000 (+0200)
Subject: * yarrow256.c (yarrow_fast_reseed): Generate two block of output
X-Git-Tag: nettle_1.5_release_20020131~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=069e016707f1380925490c809ab7802c25d8f29d;p=thirdparty%2Fnettle.git

* yarrow256.c (yarrow_fast_reseed): Generate two block of output
using the old key and feed into the pool.

Rev: src/nettle/yarrow256.c:1.6
---

diff --git a/yarrow256.c b/yarrow256.c
index 0db78184..3e72278a 100644
--- a/yarrow256.c
+++ b/yarrow256.c
@@ -70,10 +70,19 @@ static void
 yarrow_fast_reseed(struct yarrow256_ctx *ctx)
 {
   uint8_t digest[SHA256_DIGEST_SIZE];
-  
   unsigned i;
 
-  /* FIXME: Mixin the current key! */
+  /* We feed two block of output using the current key into the pool
+   * before emptying it. */
+  if (ctx->seeded)
+    {
+      uint8_t blocks[AES_BLOCK_SIZE * 2];
+      
+      yarrow_generate_block(ctx, blocks);
+      yarrow_generate_block(ctx, blocks + AES_BLOCK_SIZE);
+      sha256_update(&ctx->pools[YARROW_FAST], sizeof(blocks), blocks);
+    }
+  
   sha256_final(&ctx->pools[YARROW_FAST]);
   sha256_digest(&ctx->pools[YARROW_FAST], sizeof(digest), digest);
   sha256_init(&ctx->pools[YARROW_FAST]);