diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 09:24:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 09:24:00 -0800 |
| commit | e387dc122fc7c70c2a5df2567f4e2d1114f5a5da (patch) | |
| tree | de85b3994f8b987e23caa2c9b256aeccb065bb17 /crypto/algapi.c | |
| parent | Merge tag 'dmaengine-fix-4.10-rc7' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes (diff) | |
| download | linux-rng-e387dc122fc7c70c2a5df2567f4e2d1114f5a5da.tar.xz linux-rng-e387dc122fc7c70c2a5df2567f4e2d1114f5a5da.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a bug in CBC/CTR on ARM64 that breaks chaining as well as a
bug in the core API that causes registration failures when a driver
unloads and then reloads an algorithm"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes
crypto: api - Clear CRYPTO_ALG_DEAD bit before registering an alg
Diffstat (limited to 'crypto/algapi.c')
| -rw-r--r-- | crypto/algapi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index df939b54b09f..1fad2a6b3bbb 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -356,6 +356,7 @@ int crypto_register_alg(struct crypto_alg *alg) struct crypto_larval *larval; int err; + alg->cra_flags &= ~CRYPTO_ALG_DEAD; err = crypto_check_alg(alg); if (err) return err; |