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 | ea874fbadeb1532601fef11a80f2ce21985bd402 (patch) | |
| tree | c14dbfdbf7aa261f490be310475c319fec72c3c2 /crypto | |
| parent | 1ede28e658b8f2dd7c2ce9d3829742f9e5ea9fc9 (diff) | |
| parent | 94a1f31185ec18d70ada773f519be26794d87f14 (diff) | |
| download | linux-crypto-ea874fbadeb1532601fef11a80f2ce21985bd402.tar.gz linux-crypto-ea874fbadeb1532601fef11a80f2ce21985bd402.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 '')
| -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 df939b54..1fad2a6b 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; |