From af17e5a006a6b532e90ae2d49747f3dc67fd4f4d Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 14 Aug 2009 22:55:35 +1000 Subject: [PATCH] --- yaml --- r: 158024 b: refs/heads/master c: 63b5ac286d5d7f668da537cc53a552578f7674a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/crypto/ablkcipher.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 64cad5340a59..489e5b6e7c4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aef27136b8b5e526f2e96ca1caa30a6d07e70f42 +refs/heads/master: 63b5ac286d5d7f668da537cc53a552578f7674a2 diff --git a/trunk/crypto/ablkcipher.c b/trunk/crypto/ablkcipher.c index 03fb5facf0b4..f6f08336df5d 100644 --- a/trunk/crypto/ablkcipher.c +++ b/trunk/crypto/ablkcipher.c @@ -183,6 +183,12 @@ EXPORT_SYMBOL_GPL(crypto_givcipher_type); const char *crypto_default_geniv(const struct crypto_alg *alg) { + if (((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == + CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize : + alg->cra_ablkcipher.ivsize) != + alg->cra_blocksize) + return "chainiv"; + return alg->cra_flags & CRYPTO_ALG_ASYNC ? "eseqiv" : skcipher_default_geniv; }