projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'regmap/for-next'
[linux]
/
drivers
/
crypto
/
n2_core.c
diff --git
a/drivers/crypto/n2_core.c
b/drivers/crypto/n2_core.c
index
55f34cf
..
9450c41
100644
(file)
--- a/
drivers/crypto/n2_core.c
+++ b/
drivers/crypto/n2_core.c
@@
-772,7
+772,7
@@
static int n2_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
}
err = des_ekey(tmp, key);
- if (err == 0 && (tfm->crt_flags & CRYPTO_TFM_REQ_
WEAK_KEY
)) {
+ if (err == 0 && (tfm->crt_flags & CRYPTO_TFM_REQ_
FORBID_WEAK_KEYS
)) {
tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
return -EINVAL;
}