diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2010-07-25 11:14:19 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2010-07-25 11:14:19 +0200 |
| commit | 55d15220791c10c6b1aaba02a82398162895086d (patch) | |
| tree | 8448eab76028234eada979904fb34f1dac680fff /camellia-set-decrypt-key.c | |
| parent | adcde24f355d8fca166e984d98ae305abef8aa64 (diff) | |
| download | nettle-55d15220791c10c6b1aaba02a82398162895086d.tar.gz | |
* camellia.h (struct camellia_ctx): Eliminate the two unused
subkeys, and renumber the remaining ones.
* camellia-crypt-internal.c (_camellia_crypt): Updated for
renumbered subkeys.
* camellia-set-encrypt-key.c (camellia_set_encrypt_key): Likewise.
* camellia-set-decrypt-key.c (camellia_invert_key): Likewise.
Rev: nettle/ChangeLog:1.101
Rev: nettle/camellia-crypt-internal.c:1.2
Rev: nettle/camellia-set-decrypt-key.c:1.2
Rev: nettle/camellia-set-encrypt-key.c:1.4
Rev: nettle/camellia.h:1.5
Diffstat (limited to 'camellia-set-decrypt-key.c')
| -rw-r--r-- | camellia-set-decrypt-key.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/camellia-set-decrypt-key.c b/camellia-set-decrypt-key.c index 761dcda8..cd49c11b 100644 --- a/camellia-set-decrypt-key.c +++ b/camellia-set-decrypt-key.c @@ -40,17 +40,15 @@ camellia_invert_key(struct camellia_ctx *dst, unsigned i; if (dst == src) { - SWAP(dst->keys[0], dst->keys[nkeys - 2]); - for (i = 2; i < nkeys - 1 - i; i++) + for (i = 0; i < nkeys - 1 - i; i++) SWAP(dst->keys[i], dst->keys[nkeys - 1 - i]); } else { dst->nkeys = nkeys; - dst->keys[0] = src->keys[nkeys - 2]; - for (i = 2; i < nkeys - 2; i++) + + for (i = 0; i < nkeys; i++) dst->keys[i] = src->keys[nkeys - 1 - i]; - dst->keys[nkeys - 2] = src->keys[0]; } } |