hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jussi Kivilinna 2011-09-26 16:47:20 +03:00 committed by Herbert Xu
parent ee5002a549
commit 91d41f159d
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/crypto/twofish-i586-asm_32.S
View File

@ -26,7 +26,7 @@
#define in_blk 12 /* input byte array address parameter*/ #define in_blk 12 /* input byte array address parameter*/
#define out_blk 8 /* output byte array address parameter*/ #define out_blk 8 /* output byte array address parameter*/
#define tfm 4 /* Twofish context structure */ #define ctx 4 /* Twofish context structure */
#define a_offset 0 #define a_offset 0
#define b_offset 4 #define b_offset 4
@ -229,8 +229,8 @@ twofish_enc_blk:
push %esi push %esi
push %edi push %edi
mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ mov ctx + 16(%esp), %ebp /* abuse the base pointer: set new base
add $crypto_tfm_ctx_offset, %ebp /* ctx address */ * pointer to the ctx address */
mov in_blk+16(%esp),%edi /* input address in edi */ mov in_blk+16(%esp),%edi /* input address in edi */
mov (%edi), %eax mov (%edi), %eax
@ -285,8 +285,8 @@ twofish_dec_blk:
push %edi push %edi
mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ mov ctx + 16(%esp), %ebp /* abuse the base pointer: set new base
add $crypto_tfm_ctx_offset, %ebp /* ctx address */ * pointer to the ctx address */
mov in_blk+16(%esp),%edi /* input address in edi */ mov in_blk+16(%esp),%edi /* input address in edi */
mov (%edi), %eax mov (%edi), %eax

6
arch/x86/crypto/twofish-x86_64-asm_64.S
View File

@ -221,10 +221,9 @@
twofish_enc_blk: twofish_enc_blk:
pushq R1 pushq R1
/* %rdi contains the crypto tfm address */ /* %rdi contains the ctx address */
/* %rsi contains the output address */ /* %rsi contains the output address */
/* %rdx contains the input address */ /* %rdx contains the input address */
add $crypto_tfm_ctx_offset, %rdi /* set ctx address */
/* ctx address is moved to free one non-rex register /* ctx address is moved to free one non-rex register
as target for the 8bit high operations */ as target for the 8bit high operations */
mov %rdi, %r11 mov %rdi, %r11
@ -274,10 +273,9 @@ twofish_enc_blk:
twofish_dec_blk: twofish_dec_blk:
pushq R1 pushq R1
/* %rdi contains the crypto tfm address */ /* %rdi contains the ctx address */
/* %rsi contains the output address */ /* %rsi contains the output address */
/* %rdx contains the input address */ /* %rdx contains the input address */
add $crypto_tfm_ctx_offset, %rdi /* set ctx address */
/* ctx address is moved to free one non-rex register /* ctx address is moved to free one non-rex register
as target for the 8bit high operations */ as target for the 8bit high operations */
mov %rdi, %r11 mov %rdi, %r11

12
arch/x86/crypto/twofish_glue.c
View File

@ -44,17 +44,21 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
asmlinkage void twofish_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); asmlinkage void twofish_enc_blk(struct twofish_ctx *ctx, u8 *dst,
asmlinkage void twofish_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); const u8 *src);
EXPORT_SYMBOL_GPL(twofish_enc_blk);
asmlinkage void twofish_dec_blk(struct twofish_ctx *ctx, u8 *dst,
const u8 *src);
EXPORT_SYMBOL_GPL(twofish_dec_blk);
static void twofish_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) static void twofish_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
twofish_enc_blk(tfm, dst, src); twofish_enc_blk(crypto_tfm_ctx(tfm), dst, src);
} }
static void twofish_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) static void twofish_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
twofish_dec_blk(tfm, dst, src); twofish_dec_blk(crypto_tfm_ctx(tfm), dst, src);
} }
static struct crypto_alg alg = { static struct crypto_alg alg = {