diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2011-09-26 09:47:20 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-10-21 08:23:08 -0400 |
| commit | 91d41f159d75d602f6001218eec64c5e761475a6 (patch) | |
| tree | 1bc2607e291604764348bccdb6cf6f9a0b5e4fbb /arch/x86/crypto/twofish-i586-asm_32.S | |
| parent | ee5002a5497f3219b4144b5370203ed6e43f7269 (diff) | |
crypto: twofish-x86-asm - make assembler functions use twofish_ctx instead of crypto_tfm
This needed by 3-way twofish patch to be able to easily use one block
assembler functions. As glue code is shared between i586/x86_64 apply
change to i586 assembler too. Also export assembler functions for
3-way parallel twofish module.
CC: Joachim Fritschi <jfritschi@freenet.de>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto/twofish-i586-asm_32.S')
| -rw-r--r-- | arch/x86/crypto/twofish-i586-asm_32.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/crypto/twofish-i586-asm_32.S b/arch/x86/crypto/twofish-i586-asm_32.S index 575331cb2a8..658af4bb35c 100644 --- a/arch/x86/crypto/twofish-i586-asm_32.S +++ b/arch/x86/crypto/twofish-i586-asm_32.S | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #define in_blk 12 /* input byte array address parameter*/ | 27 | #define in_blk 12 /* input byte array address parameter*/ |
| 28 | #define out_blk 8 /* output byte array address parameter*/ | 28 | #define out_blk 8 /* output byte array address parameter*/ |
| 29 | #define tfm 4 /* Twofish context structure */ | 29 | #define ctx 4 /* Twofish context structure */ |
| 30 | 30 | ||
| 31 | #define a_offset 0 | 31 | #define a_offset 0 |
| 32 | #define b_offset 4 | 32 | #define b_offset 4 |
| @@ -229,8 +229,8 @@ twofish_enc_blk: | |||
| 229 | push %esi | 229 | push %esi |
| 230 | push %edi | 230 | push %edi |
| 231 | 231 | ||
| 232 | mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ | 232 | mov ctx + 16(%esp), %ebp /* abuse the base pointer: set new base |
| 233 | add $crypto_tfm_ctx_offset, %ebp /* ctx address */ | 233 | * pointer to the ctx address */ |
| 234 | mov in_blk+16(%esp),%edi /* input address in edi */ | 234 | mov in_blk+16(%esp),%edi /* input address in edi */ |
| 235 | 235 | ||
| 236 | mov (%edi), %eax | 236 | mov (%edi), %eax |
| @@ -285,8 +285,8 @@ twofish_dec_blk: | |||
| 285 | push %edi | 285 | push %edi |
| 286 | 286 | ||
| 287 | 287 | ||
| 288 | mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ | 288 | mov ctx + 16(%esp), %ebp /* abuse the base pointer: set new base |
| 289 | add $crypto_tfm_ctx_offset, %ebp /* ctx address */ | 289 | * pointer to the ctx address */ |
| 290 | mov in_blk+16(%esp),%edi /* input address in edi */ | 290 | mov in_blk+16(%esp),%edi /* input address in edi */ |
| 291 | 291 | ||
| 292 | mov (%edi), %eax | 292 | mov (%edi), %eax |