diff options
Diffstat (limited to 'crypto/cast5.c')
-rw-r--r-- | crypto/cast5.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/cast5.c b/crypto/cast5.c index 8834c8580c04..08eef58c1d3d 100644 --- a/crypto/cast5.c +++ b/crypto/cast5.c | |||
@@ -577,9 +577,9 @@ static const u32 sb8[256] = { | |||
577 | (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) ) | 577 | (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) ) |
578 | 578 | ||
579 | 579 | ||
580 | static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf) | 580 | static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) |
581 | { | 581 | { |
582 | struct cast5_ctx *c = (struct cast5_ctx *) ctx; | 582 | struct cast5_ctx *c = crypto_tfm_ctx(tfm); |
583 | const __be32 *src = (const __be32 *)inbuf; | 583 | const __be32 *src = (const __be32 *)inbuf; |
584 | __be32 *dst = (__be32 *)outbuf; | 584 | __be32 *dst = (__be32 *)outbuf; |
585 | u32 l, r, t; | 585 | u32 l, r, t; |
@@ -642,9 +642,9 @@ static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf) | |||
642 | dst[1] = cpu_to_be32(l); | 642 | dst[1] = cpu_to_be32(l); |
643 | } | 643 | } |
644 | 644 | ||
645 | static void cast5_decrypt(void *ctx, u8 * outbuf, const u8 * inbuf) | 645 | static void cast5_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) |
646 | { | 646 | { |
647 | struct cast5_ctx *c = (struct cast5_ctx *) ctx; | 647 | struct cast5_ctx *c = crypto_tfm_ctx(tfm); |
648 | const __be32 *src = (const __be32 *)inbuf; | 648 | const __be32 *src = (const __be32 *)inbuf; |
649 | __be32 *dst = (__be32 *)outbuf; | 649 | __be32 *dst = (__be32 *)outbuf; |
650 | u32 l, r, t; | 650 | u32 l, r, t; |
@@ -769,15 +769,15 @@ static void key_schedule(u32 * x, u32 * z, u32 * k) | |||
769 | } | 769 | } |
770 | 770 | ||
771 | 771 | ||
772 | static int | 772 | static int cast5_setkey(struct crypto_tfm *tfm, const u8 *key, |
773 | cast5_setkey(void *ctx, const u8 * key, unsigned key_len, u32 * flags) | 773 | unsigned key_len, u32 *flags) |
774 | { | 774 | { |
775 | struct cast5_ctx *c = crypto_tfm_ctx(tfm); | ||
775 | int i; | 776 | int i; |
776 | u32 x[4]; | 777 | u32 x[4]; |
777 | u32 z[4]; | 778 | u32 z[4]; |
778 | u32 k[16]; | 779 | u32 k[16]; |
779 | __be32 p_key[4]; | 780 | __be32 p_key[4]; |
780 | struct cast5_ctx *c = (struct cast5_ctx *) ctx; | ||
781 | 781 | ||
782 | if (key_len < 5 || key_len > 16) { | 782 | if (key_len < 5 || key_len > 16) { |
783 | *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; | 783 | *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; |