diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
| commit | 0d6c1ba342ec528e952c4c99833cd4802918f9c7 (patch) | |
| tree | 3f9b77b397ec915c0eb026a9b6425e82fa843e67 /crypto/algboss.c | |
| parent | 3e39d71f9e785538cfb91cd75e7f169bb2a34d5b (diff) | |
| parent | 46cc85f2e4aef88c237a0407cf5d163619a4d565 (diff) | |
| download | linux-crypto-0d6c1ba342ec528e952c4c99833cd4802918f9c7.tar.gz linux-crypto-0d6c1ba342ec528e952c4c99833cd4802918f9c7.zip | |
Merge tag 'v4.10-rc1' into spi-s3c64xx
Linux 4.10-rc1
Diffstat (limited to 'crypto/algboss.c')
| -rw-r--r-- | crypto/algboss.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/algboss.c b/crypto/algboss.c index 6e39d9c0..ccb85e17 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -247,12 +247,8 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg) memcpy(param->alg, alg->cra_name, sizeof(param->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)) + /* Do not test internal algorithms. */ + if (type & CRYPTO_ALG_INTERNAL) type |= CRYPTO_ALG_TESTED; param->type = type; |