Commit 7f0c28dc authored by Niels Möller's avatar Niels Möller
Browse files

Adapted yarrow code to use new aes256 interface.

parent 31a51477
2013-08-13 Niels Möller <nisse@lysator.liu.se>
* yarrow.h (struct yarrow256_ctx): Use aes256_ctx, not aes_ctx.
* yarrow256.c: Adapted to use new aes256 interface.
2013-08-07 Niels Möller <nisse@lysator.liu.se> 2013-08-07 Niels Möller <nisse@lysator.liu.se>
* umac.h (_UMAC_STATE): Use struct aes128_ctx, not aes_ctx. * umac.h (_UMAC_STATE): Use struct aes128_ctx, not aes_ctx.
......
...@@ -72,7 +72,7 @@ struct yarrow256_ctx ...@@ -72,7 +72,7 @@ struct yarrow256_ctx
int seeded; int seeded;
/* The current key and counter block */ /* The current key and counter block */
struct aes_ctx key; struct aes256_ctx key;
uint8_t counter[AES_BLOCK_SIZE]; uint8_t counter[AES_BLOCK_SIZE];
/* The entropy sources */ /* The entropy sources */
......
...@@ -118,7 +118,7 @@ yarrow_generate_block(struct yarrow256_ctx *ctx, ...@@ -118,7 +118,7 @@ yarrow_generate_block(struct yarrow256_ctx *ctx,
{ {
unsigned i; unsigned i;
aes_encrypt(&ctx->key, sizeof(ctx->counter), block, ctx->counter); aes256_encrypt(&ctx->key, sizeof(ctx->counter), block, ctx->counter);
/* Increment counter, treating it as a big-endian number. This is /* Increment counter, treating it as a big-endian number. This is
* machine independent, and follows appendix B of the NIST * machine independent, and follows appendix B of the NIST
...@@ -190,12 +190,12 @@ yarrow256_fast_reseed(struct yarrow256_ctx *ctx) ...@@ -190,12 +190,12 @@ yarrow256_fast_reseed(struct yarrow256_ctx *ctx)
/* Iterate */ /* Iterate */
yarrow_iterate(digest); yarrow_iterate(digest);
aes_set_encrypt_key(&ctx->key, sizeof(digest), digest); aes256_set_encrypt_key(&ctx->key, digest);
ctx->seeded = 1; ctx->seeded = 1;
/* Derive new counter value */ /* Derive new counter value */
memset(ctx->counter, 0, sizeof(ctx->counter)); memset(ctx->counter, 0, sizeof(ctx->counter));
aes_encrypt(&ctx->key, sizeof(ctx->counter), ctx->counter, ctx->counter); aes256_encrypt(&ctx->key, sizeof(ctx->counter), ctx->counter, ctx->counter);
/* Reset estimates. */ /* Reset estimates. */
for (i = 0; i<ctx->nsources; i++) for (i = 0; i<ctx->nsources; i++)
...@@ -305,13 +305,13 @@ yarrow256_update(struct yarrow256_ctx *ctx, ...@@ -305,13 +305,13 @@ yarrow256_update(struct yarrow256_ctx *ctx,
static void static void
yarrow_gate(struct yarrow256_ctx *ctx) yarrow_gate(struct yarrow256_ctx *ctx)
{ {
uint8_t key[AES_MAX_KEY_SIZE]; uint8_t key[AES256_KEY_SIZE];
unsigned i; unsigned i;
for (i = 0; i < sizeof(key); i+= AES_BLOCK_SIZE) for (i = 0; i < sizeof(key); i+= AES_BLOCK_SIZE)
yarrow_generate_block(ctx, key + i); yarrow_generate_block(ctx, key + i);
aes_set_encrypt_key(&ctx->key, sizeof(key), key); aes256_set_encrypt_key(&ctx->key, key);
} }
void void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment