1 files changed, 11 insertions, 8 deletions

diff --git a/crypto/blowfish.c b/crypto/blowfish.c
index 7f710b201f20..490265f42b3b 100644
--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@@ -349,7 +349,7 @@ static void encrypt_block(struct bf_ctx *bctx, u32 *dst, u32 *src)
         dst[1] = yl;
 }
 
-static void bf_encrypt(void *ctx, u8 *dst, const u8 *src)
+static void bf_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
         const __be32 *in_blk = (const __be32 *)src;
         __be32 *const out_blk = (__be32 *)dst;
@@ -357,17 +357,18 @@ static void bf_encrypt(void *ctx, u8 *dst, const u8 *src)
 
         in32[0] = be32_to_cpu(in_blk[0]);
         in32[1] = be32_to_cpu(in_blk[1]);
-        encrypt_block(ctx, out32, in32);
+        encrypt_block(crypto_tfm_ctx(tfm), out32, in32);
         out_blk[0] = cpu_to_be32(out32[0]);
         out_blk[1] = cpu_to_be32(out32[1]);
 }
 
-static void bf_decrypt(void *ctx, u8 *dst, const u8 *src)
+static void bf_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
+        struct bf_ctx *ctx = crypto_tfm_ctx(tfm);
         const __be32 *in_blk = (const __be32 *)src;
         __be32 *const out_blk = (__be32 *)dst;
-        const u32 *P = ((struct bf_ctx *)ctx)->p;
-        const u32 *S = ((struct bf_ctx *)ctx)->s;
+        const u32 *P = ctx->p;
+        const u32 *S = ctx->s;
         u32 yl = be32_to_cpu(in_blk[0]);
         u32 yr = be32_to_cpu(in_blk[1]);
 
@@ -398,12 +399,14 @@ static void bf_decrypt(void *ctx, u8 *dst, const u8 *src)
 /* 
  * Calculates the blowfish S and P boxes for encryption and decryption.
  */
-static int bf_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
+static int bf_setkey(struct crypto_tfm *tfm, const u8 *key,
+                     unsigned int keylen, u32 *flags)
 {
+        struct bf_ctx *ctx = crypto_tfm_ctx(tfm);
+        u32 *P = ctx->p;
+        u32 *S = ctx->s;
         short i, j, count;
         u32 data[2], temp;
-        u32 *P = ((struct bf_ctx *)ctx)->p;
-        u32 *S = ((struct bf_ctx *)ctx)->s;
 
         /* Copy the initialization s-boxes */
         for (i = 0, count = 0; i < 256; i++)