projects
/
powerpc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
fa67576
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 22 Feb 2006 18:24:52 +0000
(10:24 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 22 Feb 2006 18:24:52 +0000
(10:24 -0800)
drivers/crypto/padlock-aes.c
patch
|
blob
|
history
diff --git
a/drivers/crypto/padlock-aes.c
b/drivers/crypto/padlock-aes.c
index
64819aa
..
0c08c58
100644
(file)
--- a/
drivers/crypto/padlock-aes.c
+++ b/
drivers/crypto/padlock-aes.c
@@
-348,10
+348,10
@@
aes_set_key(void *ctx_arg, const uint8_t *in_key, unsigned int key_len, uint32_t
break;
case 32:
- E_KEY[4] = le32_to_cpu(
in_
key[4]);
- E_KEY[5] = le32_to_cpu(
in_
key[5]);
- E_KEY[6] = le32_to_cpu(
in_
key[6]);
- t = E_KEY[7] = le32_to_cpu(
in_
key[7]);
+ E_KEY[4] = le32_to_cpu(key[4]);
+ E_KEY[5] = le32_to_cpu(key[5]);
+ E_KEY[6] = le32_to_cpu(key[6]);
+ t = E_KEY[7] = le32_to_cpu(key[7]);
for (i = 0; i < 7; ++i)
loop8 (i);
break;