[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1208286963.11920.90.camel@brick>
Date: Tue, 15 Apr 2008 12:16:03 -0700
From: Harvey Harrison <harvey.harrison@...il.com>
To: Herbert Xu <herbert@...dor.apana.org.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] crypto: padlock-aes.c replace private copy of bit rotation
routines
Use the generic kernel implementation of the bit-rotation routines.
The generic routines to not shift by mod 32, but all callers in the
file pass constant values less than 32 making this a non-issue.
Signed-off-by: Harvey Harrison <harvey.harrison@...il.com>
---
drivers/crypto/padlock-aes.c | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 2f3ad3f..84adbc0 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -45,6 +45,7 @@
#include <crypto/algapi.h>
#include <crypto/aes.h>
+#include <linux/bitops.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
@@ -86,22 +87,8 @@ struct aes_ctx {
/* ====== Key management routines ====== */
-static inline uint32_t
-generic_rotr32 (const uint32_t x, const unsigned bits)
-{
- const unsigned n = bits % 32;
- return (x >> n) | (x << (32 - n));
-}
-
-static inline uint32_t
-generic_rotl32 (const uint32_t x, const unsigned bits)
-{
- const unsigned n = bits % 32;
- return (x << n) | (x >> (32 - n));
-}
-
-#define rotl generic_rotl32
-#define rotr generic_rotr32
+#define rotl rol32
+#define rotr ror32
/*
* #define byte(x, nr) ((unsigned char)((x) >> (nr*8)))
--
1.5.5.144.g3e42
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists