X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=crypto%2Fcast5.c;h=8834c8580c04c0b3cf0f2931900bb2c28df6d606;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=08eef58c1d3dd2328cc8819537f37df06f202cfc;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/crypto/cast5.c b/crypto/cast5.c
index 08eef58c1..8834c8580 100644
--- a/crypto/cast5.c
+++ b/crypto/cast5.c
@@ -577,9 +577,9 @@ static const u32 sb8[256] = {
     (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) )
 
 
-static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
+static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf)
 {
-	struct cast5_ctx *c = crypto_tfm_ctx(tfm);
+	struct cast5_ctx *c = (struct cast5_ctx *) ctx;
 	const __be32 *src = (const __be32 *)inbuf;
 	__be32 *dst = (__be32 *)outbuf;
 	u32 l, r, t;
@@ -642,9 +642,9 @@ static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
 	dst[1] = cpu_to_be32(l);
 }
 
-static void cast5_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
+static void cast5_decrypt(void *ctx, u8 * outbuf, const u8 * inbuf)
 {
-	struct cast5_ctx *c = crypto_tfm_ctx(tfm);
+	struct cast5_ctx *c = (struct cast5_ctx *) ctx;
 	const __be32 *src = (const __be32 *)inbuf;
 	__be32 *dst = (__be32 *)outbuf;
 	u32 l, r, t;
@@ -769,15 +769,15 @@ static void key_schedule(u32 * x, u32 * z, u32 * k)
 }
 
 
-static int cast5_setkey(struct crypto_tfm *tfm, const u8 *key,
-			unsigned key_len, u32 *flags)
+static int
+cast5_setkey(void *ctx, const u8 * key, unsigned key_len, u32 * flags)
 {
-	struct cast5_ctx *c = crypto_tfm_ctx(tfm);
 	int i;
 	u32 x[4];
 	u32 z[4];
 	u32 k[16];
 	__be32 p_key[4];
+	struct cast5_ctx *c = (struct cast5_ctx *) ctx;
 	
 	if (key_len < 5 || key_len > 16) {
 		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;