summaryrefslogtreecommitdiffstats
path: root/crypto/ablkcipher.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-06-25 08:46:31 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2009-06-25 08:46:31 +0200
commit435578aeaad5859dda8657e3ed2c1a5bc1e524ec (patch)
tree546a3a613f4656b66d217e49a238961f7e3b2c28 /crypto/ablkcipher.c
parenthwrng: Use PCI_VDEVICE (diff)
downloadlinux-435578aeaad5859dda8657e3ed2c1a5bc1e524ec.tar.xz
linux-435578aeaad5859dda8657e3ed2c1a5bc1e524ec.zip
crypto: skcipher - Fix request for sync algorithms
When a sync givcipher algorithm is requested, if an async version of the same algorithm already exists, then we will loop forever without ever constructing the sync version based on a blkcipher. This is because we did not include the requested type/mask when getting a larval for the geniv algorithm that is to be constructed. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/ablkcipher.c')
-rw-r--r--crypto/ablkcipher.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index e11ce37c7104..43fc8fb9f978 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -201,8 +201,9 @@ static int crypto_givcipher_default(struct crypto_alg *alg, u32 type, u32 mask)
int err;
larval = crypto_larval_lookup(alg->cra_driver_name,
+ (type & ~CRYPTO_ALG_TYPE_MASK) |
CRYPTO_ALG_TYPE_GIVCIPHER,
- CRYPTO_ALG_TYPE_MASK);
+ mask | CRYPTO_ALG_TYPE_MASK);
err = PTR_ERR(larval);
if (IS_ERR(larval))
goto out;