diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2013-10-10 22:13:02 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2013-10-10 22:13:02 +0200 |
| commit | 982775563f27b0fa2b92f8d4df1a950f001949a2 (patch) | |
| tree | f8c9cf66164fd90f2a9b6eec9598a68fdf6b0378 /camellia-crypt-internal.c | |
| parent | 0f052fd510e718aed31e58139b73d3aafc8ef874 (diff) | |
| download | nettle-982775563f27b0fa2b92f8d4df1a950f001949a2.tar.gz | |
Reorganized camellia interface
Use distinct context structs and functions for camellia128 and
camellia256.
Diffstat (limited to 'camellia-crypt-internal.c')
| -rw-r--r-- | camellia-crypt-internal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camellia-crypt-internal.c b/camellia-crypt-internal.c index 62090945..2d4e85be 100644 --- a/camellia-crypt-internal.c +++ b/camellia-crypt-internal.c @@ -123,7 +123,7 @@ #endif void -_camellia_crypt(unsigned rounds, +_camellia_crypt(unsigned nkeys, const uint64_t *keys, const struct camellia_table *T, size_t length, uint8_t *dst, @@ -149,7 +149,7 @@ _camellia_crypt(unsigned rounds, CAMELLIA_ROUNDSM(T, i0, keys[5], i1); CAMELLIA_ROUNDSM(T, i1, keys[6], i0); - for (i = 0; i < rounds - 8; i+= 8) + for (i = 0; i < nkeys - 8; i+= 8) { CAMELLIA_FL(i0, keys[i+7]); CAMELLIA_FLINV(i1, keys[i+8]); |