Merge to Fedora kernel-2.6.18-1.2260_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / crypto / crc32c.c

diff --git a/crypto/crc32c.c b/crypto/crc32c.c
index 256956c..f266012 100644 (file)
--- a/crypto/crc32c.c
+++ b/crypto/crc32c.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/crypto.h>
 #include <linux/crc32c.h>
+#include <linux/types.h>
 #include <asm/byteorder.h>
 
 #define CHKSUM_BLOCK_SIZE      32
@@ -30,9 +31,9 @@ struct chksum_ctx {
  * crc using table.
  */
 
-static void chksum_init(void *ctx)
+static void chksum_init(struct crypto_tfm *tfm)
 {
-       struct chksum_ctx *mctx = ctx;
+       struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
 
        mctx->crc = ~(u32)0;                    /* common usage */
 }
@@ -42,10 +43,10 @@ static void chksum_init(void *ctx)
  * If your algorithm starts with ~0, then XOR with ~0 before you set
  * the seed.
  */
-static int chksum_setkey(void *ctx, const u8 *key, unsigned int keylen,
-                         u32 *flags)
+static int chksum_setkey(struct crypto_tfm *tfm, const u8 *key,
+                        unsigned int keylen, u32 *flags)
 {
-       struct chksum_ctx *mctx = ctx;
+       struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
 
        if (keylen != sizeof(mctx->crc)) {
                if (flags)
@@ -56,9 +57,10 @@ static int chksum_setkey(void *ctx, const u8 *key, unsigned int keylen,
        return 0;
 }
 
-static void chksum_update(void *ctx, const u8 *data, unsigned int length)
+static void chksum_update(struct crypto_tfm *tfm, const u8 *data,
+                         unsigned int length)
 {
-       struct chksum_ctx *mctx = ctx;
+       struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
        u32 mcrc;
 
        mcrc = crc32c(mctx->crc, data, (size_t)length);
@@ -66,9 +68,9 @@ static void chksum_update(void *ctx, const u8 *data, unsigned int length)
        mctx->crc = mcrc;
 }
 
-static void chksum_final(void *ctx, u8 *out)
+static void chksum_final(struct crypto_tfm *tfm, u8 *out)
 {
-       struct chksum_ctx *mctx = ctx;
+       struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
        u32 mcrc = (mctx->crc ^ ~(u32)0);
        
        *(u32 *)out = __le32_to_cpu(mcrc);