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 | |
| 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')
| -rw-r--r-- | x86/camellia-crypt-internal.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/x86/camellia-crypt-internal.asm b/x86/camellia-crypt-internal.asm index 1d7290bc..77921fa4 100644 --- a/x86/camellia-crypt-internal.asm +++ b/x86/camellia-crypt-internal.asm @@ -40,7 +40,7 @@ define(<FRAME_H1>, <12(%esp)>) define(<FRAME_CNT>, <16(%esp)>) C Arguments on stack. -define(<FRAME_ROUNDS>, <40(%esp)>) +define(<FRAME_NKEYS>, <40(%esp)>) define(<FRAME_KEYS>, <44(%esp)>) define(<FRAME_TABLE>, <48(%esp)>) define(<FRAME_LENGTH>, <52(%esp)>) @@ -137,7 +137,7 @@ define(<FLINV>, < .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) @@ -169,7 +169,7 @@ PROLOGUE(_nettle_camellia_crypt) bswap L1 addl $16, FRAME_SRC movl FRAME_KEYS, KEY - movl FRAME_ROUNDS, TMP + movl FRAME_NKEYS, TMP subl $8, TMP movl TMP, FRAME_CNT xorl (KEY), L0 |