Commit 6b601cc2 authored by Niels Möller's avatar Niels Möller
Browse files

(aes_set_key): Reversed the order of the inverted

subkeys. They are now stored in the same order as they are used.

Rev: src/nettle/aes-set-key.c:1.3
parent 59814270
...@@ -89,7 +89,7 @@ mul(uint8_t a, uint8_t b) ...@@ -89,7 +89,7 @@ mul(uint8_t a, uint8_t b)
} }
static void static void
inv_mix_column(uint32_t *a, uint32_t *b) inv_mix_column(const uint32_t *a, uint32_t *b)
{ {
uint8_t c[4][4]; uint8_t c[4][4];
unsigned i, j; unsigned i, j;
...@@ -165,9 +165,9 @@ aes_set_key(struct aes_ctx *ctx, unsigned keysize, const uint8_t *key) ...@@ -165,9 +165,9 @@ aes_set_key(struct aes_ctx *ctx, unsigned keysize, const uint8_t *key)
/* Generate the inverse keys */ /* Generate the inverse keys */
for (i=0; i<4; i++) for (i=0; i<4; i++)
{ {
ctx->ikeys[i] = ctx->keys[i]; ctx->ikeys[i] = ctx->keys[lastkey-4 + i];
ctx->ikeys[lastkey-4 + i] = ctx->keys[lastkey-4 + i]; ctx->ikeys[lastkey-4 + i] = ctx->keys[i];
} }
for (i=4; i<lastkey-4; i+=4) for (i=4; i<lastkey-4; i+=4)
inv_mix_column(&(ctx->keys[i]), &(ctx->ikeys[i])); inv_mix_column(&(ctx->keys[i]), &(ctx->ikeys[lastkey-4 - i]));
} }
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