aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/khazad.c
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2006-04-05 13:26:01 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2006-06-26 03:34:37 -0400
commitd00e708cef16442cabaf23f653baf924f5d66e83 (patch)
tree29529332b4d96826711184893d5754e84d7dddcc /crypto/khazad.c
parentfcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff)
[CRYPTO] khazad: Use 32-bit reads on key
On 64-bit platform, reading 64-bit keys (which is supposed to be 32-bit aligned) at a time will result in unaligned access. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/khazad.c')
-rw-r--r--crypto/khazad.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/khazad.c b/crypto/khazad.c
index 807f2bf4ea24..5b8dc9a2d374 100644
--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@@ -758,7 +758,7 @@ static int khazad_setkey(void *ctx_arg, const u8 *in_key,
758 unsigned int key_len, u32 *flags) 758 unsigned int key_len, u32 *flags)
759{ 759{
760 struct khazad_ctx *ctx = ctx_arg; 760 struct khazad_ctx *ctx = ctx_arg;
761 const __be64 *key = (const __be64 *)in_key; 761 const __be32 *key = (const __be32 *)in_key;
762 int r; 762 int r;
763 const u64 *S = T7; 763 const u64 *S = T7;
764 u64 K2, K1; 764 u64 K2, K1;
@@ -769,8 +769,9 @@ static int khazad_setkey(void *ctx_arg, const u8 *in_key,
769 return -EINVAL; 769 return -EINVAL;
770 } 770 }
771 771
772 K2 = be64_to_cpu(key[0]); 772 /* key is supposed to be 32-bit aligned */
773 K1 = be64_to_cpu(key[1]); 773 K2 = ((u64)be32_to_cpu(key[0]) << 32) | be32_to_cpu(key[1]);
774 K1 = ((u64)be32_to_cpu(key[2]) << 32) | be32_to_cpu(key[3]);
774 775
775 /* setup the encrypt key */ 776 /* setup the encrypt key */
776 for (r = 0; r <= KHAZAD_ROUNDS; r++) { 777 for (r = 0; r <= KHAZAD_ROUNDS; r++) {