2009-06-25 06:48:34

by Herbert Xu

[permalink] [raw]
Subject: crypto: skcipher - Fix request for sync algorithms


Found this while playing with pcrypt.

commit 435578aeaad5859dda8657e3ed2c1a5bc1e524ec
Author: Herbert Xu <[email protected]>
Date: Thu Jun 25 14:46:31 2009 +0800

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 <[email protected]>

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index e11ce37..43fc8fb 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) |
err = PTR_ERR(larval);
if (IS_ERR(larval))
goto out;

Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt