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 /x86_64 | |
| parent | 0f052fd510e718aed31e58139b73d3aafc8ef874 (diff) | |
| download | nettle-982775563f27b0fa2b92f8d4df1a950f001949a2.tar.gz | |
Reorganized camellia interface
Use distinct context structs and functions for camellia128 and
camellia256.
Diffstat (limited to 'x86_64')
| -rw-r--r-- | x86_64/camellia-crypt-internal.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/x86_64/camellia-crypt-internal.asm b/x86_64/camellia-crypt-internal.asm index d78637f4..b8d201e3 100644 --- a/x86_64/camellia-crypt-internal.asm +++ b/x86_64/camellia-crypt-internal.asm @@ -26,7 +26,7 @@ C Camellia-256 543 461 C Register usage: -define(<ROUNDS>, <%rdi>) +define(<NKEYS>, <%rdi>) define(<KEYS>, <%rsi>) define(<TABLE>, <%rdx>) define(<LENGTH>, <%rcx>) @@ -117,7 +117,7 @@ C xorl XREG(TMP), XREG($1) .file "camellia-crypt-internal.asm" - C _camellia_crypt(unsigned rounds, const uint64_t *keys, + C _camellia_crypt(unsigned nkeys, const uint64_t *keys, C const struct camellia_table *T, C size_t length, uint8_t *dst, C uint8_t *src) @@ -133,7 +133,7 @@ PROLOGUE(_nettle_camellia_crypt) push %rbp push %r12 push %r13 - sub $8, ROUNDS + sub $8, NKEYS .Lblock_loop: C Load data, note that we'll happily do unaligned loads mov (SRC), I0 @@ -141,7 +141,7 @@ PROLOGUE(_nettle_camellia_crypt) mov 8(SRC), I1 bswap I1 add $16, SRC - mov XREG(ROUNDS), XREG(CNT) + mov XREG(NKEYS), XREG(CNT) mov KEYS, KEY C Whitening using first subkey |