Commit 332a20e3 authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman

libcrc32c: keep intermediate crc state in cpu order

It's upstream changeset ef19454b.

[LIB] crc32c: Keep intermediate crc state in cpu order

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: default avatarBenny Halevy <bhalevy@fs1.bhalevy.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca1b1e5c
......@@ -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 __attribute_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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment