projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iomap: iomap should be in obj-y not in lib-y
[powerpc.git]
/
crypto
/
aes.c
diff --git
a/crypto/aes.c
b/crypto/aes.c
index
a038711
..
e244077
100644
(file)
--- a/
crypto/aes.c
+++ b/
crypto/aes.c
@@
-249,13
+249,14
@@
gen_tabs (void)
}
static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
}
static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
- unsigned int key_len
, u32 *flags
)
+ unsigned int key_len)
{
struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *key = (const __le32 *)in_key;
{
struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *key = (const __le32 *)in_key;
+ u32 *flags = &tfm->crt_flags;
u32 i, t, u, v, w;
u32 i, t, u, v, w;
- if (key_len
!= 16 && key_len != 24 && key_len != 32
) {
+ if (key_len
% 8
) {
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL;
}
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL;
}