Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

23beafbe · Linus Torvalds <[email protected]> · 2009-02-17 14:22:59 -08:00

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: lrw - Fix big endian support

Merge commit. Changes below are compared with the first parent: 48c0d9ec.

Changes

1 files changed · +7 −1

File	Status	Add	Del	Content
crypto/lrw.c	modified	+7	−1	View file

diff --git a/crypto/lrw.c b/crypto/lrw.c
index 8ef664e..358f80b 100644
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -45,7 +45,13 @@ struct priv {
 
 static inline void setbit128_bbe(void *b, int bit)
 {
-	__set_bit(bit ^ 0x78, b);
+	__set_bit(bit ^ (0x80 -
+#ifdef __BIG_ENDIAN
+			 BITS_PER_LONG
+#else
+			 BITS_PER_BYTE
+#endif
+			), b);
 }
 
 static int setkey(struct crypto_tfm *parent, const u8 *key,