]> err.no Git - linux-2.6/commitdiff
[LIB] crc32c: Keep intermediate crc state in cpu order
authorBenny Halevy <bhalevy@fs1.bhalevy.com>
Thu, 8 Nov 2007 13:34:09 +0000 (21:34 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 8 Nov 2007 13:34:09 +0000 (21:34 +0800)
crypto/crc32.c:chksum_final() is computing the digest as
*(__le32 *)out = ~cpu_to_le32(mctx->crc);
so the low-level crc32c_le routines should just keep
the crc in cpu order, otherwise it is getting swabbed
one too many times on big-endian machines.

Signed-off-by: Benny Halevy <bhalevy@fs1.bhalevy.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
lib/libcrc32c.c

index 802f11f0bf5baebf99460c1e4d238921764fab93..b5c3287d8ea47567220cbafd2211dd12b5239356 100644 (file)
@@ -33,7 +33,6 @@
 #include <linux/crc32c.h>
 #include <linux/compiler.h>
 #include <linux/module.h>
-#include <asm/byteorder.h>
 
 MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
 MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations");
@@ -161,15 +160,13 @@ static const u32 crc32c_table[256] = {
  */
 
 u32 __pure
-crc32c_le(u32 seed, unsigned char const *data, size_t length)
+crc32c_le(u32 crc, unsigned char const *data, size_t length)
 {
-       u32 crc = __cpu_to_le32(seed);
-       
        while (length--)
                crc =
                    crc32c_table[(crc ^ *data++) & 0xFFL] ^ (crc >> 8);
 
-       return __le32_to_cpu(crc);
+       return crc;
 }
 
 #endif /* CRC_LE_BITS == 8 */