1 files changed, 10 insertions, 36 deletions

diff --git a/crypto/khazad.c b/crypto/khazad.c
index 738cb0dd1e7c..807f2bf4ea24 100644
--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@@ -22,8 +22,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <asm/byteorder.h>
 #include <asm/scatterlist.h>
 #include <linux/crypto.h>
+#include <linux/types.h>
 
 #define KHAZAD_KEY_SIZE         16
 #define KHAZAD_BLOCK_SIZE       8
@@ -755,8 +757,8 @@ static const u64 c[KHAZAD_ROUNDS + 1] = {
 static int khazad_setkey(void *ctx_arg, const u8 *in_key,
                        unsigned int key_len, u32 *flags)
 {
-
         struct khazad_ctx *ctx = ctx_arg;
+        const __be64 *key = (const __be64 *)in_key;
         int r;
         const u64 *S = T7;
         u64 K2, K1;
@@ -767,22 +769,8 @@ static int khazad_setkey(void *ctx_arg, const u8 *in_key,
                 return -EINVAL;
         }
 
-        K2 = ((u64)in_key[ 0] << 56) ^
-             ((u64)in_key[ 1] << 48) ^
-             ((u64)in_key[ 2] << 40) ^
-             ((u64)in_key[ 3] << 32) ^
-             ((u64)in_key[ 4] << 24) ^
-             ((u64)in_key[ 5] << 16) ^
-             ((u64)in_key[ 6] <<  8) ^
-             ((u64)in_key[ 7]      );
-        K1 = ((u64)in_key[ 8] << 56) ^
-             ((u64)in_key[ 9] << 48) ^
-             ((u64)in_key[10] << 40) ^
-             ((u64)in_key[11] << 32) ^
-             ((u64)in_key[12] << 24) ^
-             ((u64)in_key[13] << 16) ^
-             ((u64)in_key[14] <<  8) ^
-             ((u64)in_key[15]      );
+        K2 = be64_to_cpu(key[0]);
+        K1 = be64_to_cpu(key[1]);
 
         /* setup the encrypt key */
         for (r = 0; r <= KHAZAD_ROUNDS; r++) {
@@ -820,19 +808,12 @@ static int khazad_setkey(void *ctx_arg, const u8 *in_key,
 static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],
                 u8 *ciphertext, const u8 *plaintext)
 {
-
+        const __be64 *src = (const __be64 *)plaintext;
+        __be64 *dst = (__be64 *)ciphertext;
         int r;
         u64 state;
 
-        state = ((u64)plaintext[0] << 56) ^
-                ((u64)plaintext[1] << 48) ^
-                ((u64)plaintext[2] << 40) ^
-                ((u64)plaintext[3] << 32) ^
-                ((u64)plaintext[4] << 24) ^
-                ((u64)plaintext[5] << 16) ^
-                ((u64)plaintext[6] <<  8) ^
-                ((u64)plaintext[7]      ) ^
-                roundKey[0];
+        state = be64_to_cpu(*src) ^ roundKey[0];
 
         for (r = 1; r < KHAZAD_ROUNDS; r++) {
                 state = T0[(int)(state >> 56)       ] ^
@@ -856,15 +837,7 @@ static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],
                 (T7[(int)(state      ) & 0xff] & 0x00000000000000ffULL) ^
                 roundKey[KHAZAD_ROUNDS];
 
-        ciphertext[0] = (u8)(state >> 56);
-        ciphertext[1] = (u8)(state >> 48);
-        ciphertext[2] = (u8)(state >> 40);
-        ciphertext[3] = (u8)(state >> 32);
-        ciphertext[4] = (u8)(state >> 24);
-        ciphertext[5] = (u8)(state >> 16);
-        ciphertext[6] = (u8)(state >>  8);
-        ciphertext[7] = (u8)(state      );
-
+        *dst = cpu_to_be64(state);
 }
 
 static void khazad_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
@@ -884,6 +857,7 @@ static struct crypto_alg khazad_alg = {
         .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
         .cra_blocksize          =       KHAZAD_BLOCK_SIZE,
         .cra_ctxsize            =       sizeof (struct khazad_ctx),
+        .cra_alignmask          =       7,
         .cra_module             =       THIS_MODULE,
         .cra_list               =       LIST_HEAD_INIT(khazad_alg.cra_list),
         .cra_u                  =       { .cipher = {