git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: defconfig: update
[pandora-kernel.git]
/
crypto
/
ctr.c
diff --git
a/crypto/ctr.c
b/crypto/ctr.c
index
6c3bfab
..
ff7b3a3
100644
(file)
--- a/
crypto/ctr.c
+++ b/
crypto/ctr.c
@@
-185,7
+185,7
@@
static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb)
alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
- return ERR_
PTR(PTR_ERR(alg)
);
+ return ERR_
CAST(alg
);
/* Block size must be >= 4 bytes. */
err = -EINVAL;
/* Block size must be >= 4 bytes. */
err = -EINVAL;
@@
-421,4
+421,5
@@
module_exit(crypto_ctr_module_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CTR Counter block mode");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CTR Counter block mode");
-MODULE_ALIAS("rfc3686");
+MODULE_ALIAS_CRYPTO("rfc3686");
+MODULE_ALIAS_CRYPTO("ctr");