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/api.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 '')
-rw-r--r-- | crypto/api.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/crypto/api.c b/crypto/api.c index bbc147cb..b16ce165 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -211,8 +211,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask) if (!name) return ERR_PTR(-ENOENT); + type &= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD); mask &= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD); - type &= mask; alg = crypto_alg_lookup(name, type, mask); if (!alg) { @@ -310,24 +310,8 @@ static void crypto_exit_ops(struct crypto_tfm *tfm) { const struct crypto_type *type = tfm->__crt_alg->cra_type; - if (type) { - if (tfm->exit) - tfm->exit(tfm); - return; - } - - switch (crypto_tfm_alg_type(tfm)) { - case CRYPTO_ALG_TYPE_CIPHER: - crypto_exit_cipher_ops(tfm); - break; - - case CRYPTO_ALG_TYPE_COMPRESS: - crypto_exit_compress_ops(tfm); - break; - - default: - BUG(); - } + if (type && tfm->exit) + tfm->exit(tfm); } static unsigned int crypto_ctxsize(struct crypto_alg *alg, u32 type, u32 mask) |