aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-01-01 15:49:17 +1100
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-11 08:17:00 +1100
commit94765b9e4cba8e3c51c292338db16aa174894d30 (patch)
tree9f444b1543acf431c8d4ca5c0d100b270220c1a2 /crypto
parent1b87887d6c232becba77835b29a424cf78442b7d (diff)
downloadkernel_samsung_aries-94765b9e4cba8e3c51c292338db16aa174894d30.zip
kernel_samsung_aries-94765b9e4cba8e3c51c292338db16aa174894d30.tar.gz
kernel_samsung_aries-94765b9e4cba8e3c51c292338db16aa174894d30.tar.bz2
[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 <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/xcbc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index e3d9503..a82959d 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;