(yarrow_slow_reseed): Bug fix, update the fast pool

with the digest of the slow pool.
(yarrow256_init): Initialize seed_file and counter to zero, to
ease debugging.

Rev: src/nettle/yarrow256.c:1.14

1 files changed, 6 insertions, 1 deletions

diff --git a/yarrow256.c b/yarrow256.c
index af3160d9..ad6c3b56 100644
--- a/yarrow256.c
+++ b/yarrow256.c
@@ -84,6 +84,11 @@ yarrow256_init(struct yarrow256_ctx *ctx,
   
   ctx->seeded = 0;
 
+  /* Not strictly, necessary, but it makes it easier to see if the
+   * values are sane. */
+  memset(ctx->seed_file, 0, YARROW256_SEED_FILE_SIZE);
+  memset(ctx->counter, 0, sizeof(ctx->counter));
+  
   ctx->nsources = n;
   ctx->sources = s;
 
@@ -228,7 +233,7 @@ yarrow_slow_reseed(struct yarrow256_ctx *ctx)
   sha256_init(&ctx->pools[YARROW_SLOW]);
 
   /* Feed it into the fast pool */
-  sha256_update(&ctx->pools[YARROW_SLOW], sizeof(digest), digest);
+  sha256_update(&ctx->pools[YARROW_FAST], sizeof(digest), digest);
 
   yarrow_fast_reseed(ctx);