projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[deliverable/linux.git]
/
crypto
/
cbc.c
diff --git
a/crypto/cbc.c
b/crypto/cbc.c
index 6affff882cf835bb88f43e0e5aa68951a8e2ac1a..780ee27b2d43d5f3620d32c4df6c00670b6c48c8 100644
(file)
--- a/
crypto/cbc.c
+++ b/
crypto/cbc.c
@@
-224,7
+224,7
@@
static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
- return ERR_
PTR(PTR_ERR(alg)
);
+ return ERR_
CAST(alg
);
inst = ERR_PTR(-EINVAL);
if (!is_power_of_2(alg->cra_blocksize))
inst = ERR_PTR(-EINVAL);
if (!is_power_of_2(alg->cra_blocksize))
@@
-289,3
+289,4
@@
module_exit(crypto_cbc_module_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CBC block cipher algorithm");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CBC block cipher algorithm");
+MODULE_ALIAS_CRYPTO("cbc");
This page took
0.027008 seconds
and
5
git commands to generate.