git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[safe/jmp/linux-2.6]
/
crypto
/
des_generic.c
diff --git
a/crypto/des_generic.c
b/crypto/des_generic.c
index
355ecb7
..
5bd3ee3
100644
(file)
--- a/
crypto/des_generic.c
+++ b/
crypto/des_generic.c
@@
-868,9
+868,10
@@
static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,
u32 *flags = &tfm->crt_flags;
if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
u32 *flags = &tfm->crt_flags;
if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
- !((K[2] ^ K[4]) | (K[3] ^ K[5]))))
+ !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
+ (*flags & CRYPTO_TFM_REQ_WEAK_KEY))
{
{
- *flags |= CRYPTO_TFM_RES_
BAD_KEY_SCHED
;
+ *flags |= CRYPTO_TFM_RES_
WEAK_KEY
;
return -EINVAL;
}
return -EINVAL;
}
@@
-977,7
+978,7
@@
static struct crypto_alg des3_ede_alg = {
MODULE_ALIAS("des3_ede");
MODULE_ALIAS("des3_ede");
-static int __init init(void)
+static int __init
des_generic_mod_
init(void)
{
int ret = 0;
{
int ret = 0;
@@
-992,14
+993,14
@@
out:
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
des_generic_mod_
fini(void)
{
crypto_unregister_alg(&des3_ede_alg);
crypto_unregister_alg(&des_alg);
}
{
crypto_unregister_alg(&des3_ede_alg);
crypto_unregister_alg(&des_alg);
}
-module_init(init);
-module_exit(fini);
+module_init(
des_generic_mod_
init);
+module_exit(
des_generic_mod_
fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");