AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[CRYPTO] khazad: Use 32-bit reads on key

Browse Source 
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>
This commit is contained in:
Atsushi Nemoto 2006-04-06 03:26:01 +10:00 committed by Herbert Xu
parent fcc18e83e1
commit d00e708cef
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/khazad.c
View File

@ -758,7 +758,7 @@ 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;
const __be32 *key = (const __be32 *)in_key;
int r;
const u64 *S = T7;
u64 K2, K1;
@ -769,8 +769,9 @@ static int khazad_setkey(void *ctx_arg, const u8 *in_key,
return -EINVAL;
}
K2 = be64_to_cpu(key[0]);
K1 = be64_to_cpu(key[1]);
/* key is supposed to be 32-bit aligned */
K2 = ((u64)be32_to_cpu(key[0]) << 32) | be32_to_cpu(key[1]);
K1 = ((u64)be32_to_cpu(key[2]) << 32) | be32_to_cpu(key[3]);
/* setup the encrypt key */
for (r = 0; r <= KHAZAD_ROUNDS; r++) {