diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2008-11-22 17:48:16 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2008-11-22 17:48:16 +0100 |
| commit | ec881c84b63975f70ffac77ad294deef341e6a51 (patch) | |
| tree | 7379a6972ae434d177daf2112eb2cfe334125c60 /yarrow256.c | |
| parent | a2dc0c3073aa3ab75ea02dde9cb11825dcc28148 (diff) | |
| download | nettle-ec881c84b63975f70ffac77ad294deef341e6a51.tar.gz | |
(yarrow256_fast_reseed): Set ctx->seeded = 1, so
that it is set if and only if the aes context has been initialized
with aes_set_encrypt_key.
(yarrow256_seed): No need to set ctx->seeded here.
(yarrow256_update): Likewise.
Rev: nettle/ChangeLog:1.28
Rev: nettle/yarrow256.c:1.5
Diffstat (limited to 'yarrow256.c')
| -rw-r--r-- | yarrow256.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/yarrow256.c b/yarrow256.c index e1ae77c1..0a5f8a09 100644 --- a/yarrow256.c +++ b/yarrow256.c @@ -108,8 +108,6 @@ yarrow256_seed(struct yarrow256_ctx *ctx, sha256_update(&ctx->pools[YARROW_FAST], length, seed_file); yarrow256_fast_reseed(ctx); - - ctx->seeded = 1; } /* FIXME: Generalize so that it generates a few more blocks at a @@ -193,6 +191,7 @@ yarrow256_fast_reseed(struct yarrow256_ctx *ctx) yarrow_iterate(digest); aes_set_encrypt_key(&ctx->key, sizeof(digest), digest); + ctx->seeded = 1; /* Derive new counter value */ memset(ctx->counter, 0, sizeof(ctx->counter)); @@ -294,8 +293,6 @@ yarrow256_update(struct yarrow256_ctx *ctx, if (!yarrow256_needed_sources(ctx)) { yarrow256_slow_reseed(ctx); - ctx->seeded = 1; - return 1; } else |