]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
crypto: algboss - Remove reference to nivaead
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 13 Aug 2015 09:28:49 +0000 (17:28 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 17 Aug 2015 08:53:41 +0000 (16:53 +0800)
This patch removes a legacy reference to nivaead which is no longer
used.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/algboss.c

index 76fc0b23fc6cfd4c33188cd6e5b7454603b7a751..6e39d9c05b98a532400f83d173ab9884cbb43a96 100644 (file)
@@ -248,13 +248,11 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg)
        type = alg->cra_flags;
 
        /* This piece of crap needs to disappear into per-type test hooks. */
-       if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
-              CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
-            ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
-             CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
-                                         alg->cra_ablkcipher.ivsize)) ||
-           (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
-            alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+       if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+             CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+           ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+            CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
+                                        alg->cra_ablkcipher.ivsize))
                type |= CRYPTO_ALG_TESTED;
 
        param->type = type;