Messages in this thread Patch in this message | | | Subject | [PATCH] crypto: padlock-aes.c replace private copy of bit rotation routines | From | Harvey Harrison <> | Date | Tue, 15 Apr 2008 12:16:03 -0700 |
| |
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@gmail.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
| |