diff options
Diffstat (limited to 'crypto/anubis.c')
-rw-r--r-- | crypto/anubis.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/anubis.c b/crypto/anubis.c index 2c796bdb91a6..7e2e1a29800e 100644 --- a/crypto/anubis.c +++ b/crypto/anubis.c | |||
@@ -460,16 +460,15 @@ static const u32 rc[] = { | |||
460 | 0xf726ffedU, 0xe89d6f8eU, 0x19a0f089U, | 460 | 0xf726ffedU, 0xe89d6f8eU, 0x19a0f089U, |
461 | }; | 461 | }; |
462 | 462 | ||
463 | static int anubis_setkey(void *ctx_arg, const u8 *in_key, | 463 | static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key, |
464 | unsigned int key_len, u32 *flags) | 464 | unsigned int key_len, u32 *flags) |
465 | { | 465 | { |
466 | struct anubis_ctx *ctx = crypto_tfm_ctx(tfm); | ||
466 | const __be32 *key = (const __be32 *)in_key; | 467 | const __be32 *key = (const __be32 *)in_key; |
467 | int N, R, i, r; | 468 | int N, R, i, r; |
468 | u32 kappa[ANUBIS_MAX_N]; | 469 | u32 kappa[ANUBIS_MAX_N]; |
469 | u32 inter[ANUBIS_MAX_N]; | 470 | u32 inter[ANUBIS_MAX_N]; |
470 | 471 | ||
471 | struct anubis_ctx *ctx = ctx_arg; | ||
472 | |||
473 | switch (key_len) | 472 | switch (key_len) |
474 | { | 473 | { |
475 | case 16: case 20: case 24: case 28: | 474 | case 16: case 20: case 24: case 28: |
@@ -660,15 +659,15 @@ static void anubis_crypt(u32 roundKey[ANUBIS_MAX_ROUNDS + 1][4], | |||
660 | dst[i] = cpu_to_be32(inter[i]); | 659 | dst[i] = cpu_to_be32(inter[i]); |
661 | } | 660 | } |
662 | 661 | ||
663 | static void anubis_encrypt(void *ctx_arg, u8 *dst, const u8 *src) | 662 | static void anubis_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) |
664 | { | 663 | { |
665 | struct anubis_ctx *ctx = ctx_arg; | 664 | struct anubis_ctx *ctx = crypto_tfm_ctx(tfm); |
666 | anubis_crypt(ctx->E, dst, src, ctx->R); | 665 | anubis_crypt(ctx->E, dst, src, ctx->R); |
667 | } | 666 | } |
668 | 667 | ||
669 | static void anubis_decrypt(void *ctx_arg, u8 *dst, const u8 *src) | 668 | static void anubis_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) |
670 | { | 669 | { |
671 | struct anubis_ctx *ctx = ctx_arg; | 670 | struct anubis_ctx *ctx = crypto_tfm_ctx(tfm); |
672 | anubis_crypt(ctx->D, dst, src, ctx->R); | 671 | anubis_crypt(ctx->D, dst, src, ctx->R); |
673 | } | 672 | } |
674 | 673 | ||