From: Herbert Xu Date: Tue, 1 Jan 2008 04:49:17 +0000 (+1100) Subject: [CRYPTO] xcbc: Remove bogus hash/cipher test X-Git-Tag: v2.6.25-rc1~1242^2~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=94765b9e4cba8e3c51c292338db16aa174894d30;p=linux-2.6-omap-h63xx.git [CRYPTO] xcbc: Remove bogus hash/cipher test When setting the digest size xcbc tests to see if the underlying algorithm is a hash. This is silly because we don't allow it to be a hash and we've specifically requested for a cipher. This patch removes the bogus test. Signed-off-by: Herbert Xu --- diff --git a/crypto/xcbc.c b/crypto/xcbc.c index e3d9503a034..a82959df678 100644 --- a/crypto/xcbc.c +++ b/crypto/xcbc.c @@ -321,10 +321,7 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb) inst->alg.cra_alignmask = alg->cra_alignmask; inst->alg.cra_type = &crypto_hash_type; - inst->alg.cra_hash.digestsize = - (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == - CRYPTO_ALG_TYPE_HASH ? alg->cra_hash.digestsize : - alg->cra_blocksize; + inst->alg.cra_hash.digestsize = alg->cra_blocksize; inst->alg.cra_ctxsize = sizeof(struct crypto_xcbc_ctx) + ALIGN(inst->alg.cra_blocksize * 3, sizeof(void *)); inst->alg.cra_init = xcbc_init_tfm;