From 982775563f27b0fa2b92f8d4df1a950f001949a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 10 Oct 2013 22:13:02 +0200 Subject: Reorganized camellia interface Use distinct context structs and functions for camellia128 and camellia256. --- x86/camellia-crypt-internal.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'x86') 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(, <12(%esp)>) define(, <16(%esp)>) C Arguments on stack. -define(, <40(%esp)>) +define(, <40(%esp)>) define(, <44(%esp)>) define(, <48(%esp)>) define(, <52(%esp)>) @@ -137,7 +137,7 @@ define(, < .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 -- cgit v1.2.1