diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-06-30 12:07:51 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-30 12:07:51 +0200 |
| commit | 775a75f3d61c6fc82bedc5b727784d3cb7089d81 (patch) | |
| tree | b2869d8a2378b79448add1f41f01982b7fae82fb /crypto/essiv.c | |
| parent | 3278a1722acf54316ac94db3f3a83aed32857edc (diff) | |
| parent | d2868ae33ab257f2273d436b38cc390414a9384f (diff) | |
| download | linux-crypto-775a75f3d61c6fc82bedc5b727784d3cb7089d81.tar.gz linux-crypto-775a75f3d61c6fc82bedc5b727784d3cb7089d81.zip | |
Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier:
- Fix atomicity of affinity update in the GIC driver
- Don't sleep in atomic when waiting for a GICv4.1 RD to respond
- Fix a couple of typos in user-visible messages
Diffstat (limited to '')
| -rw-r--r-- | crypto/essiv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/essiv.c b/crypto/essiv.c index 465a89c9..a7f45dbc 100644 --- a/crypto/essiv.c +++ b/crypto/essiv.c @@ -66,7 +66,6 @@ static int essiv_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { struct essiv_tfm_ctx *tctx = crypto_skcipher_ctx(tfm); - SHASH_DESC_ON_STACK(desc, tctx->hash); u8 salt[HASH_MAX_DIGESTSIZE]; int err; @@ -78,8 +77,7 @@ static int essiv_skcipher_setkey(struct crypto_skcipher *tfm, if (err) return err; - desc->tfm = tctx->hash; - err = crypto_shash_digest(desc, key, keylen, salt); + err = crypto_shash_tfm_digest(tctx->hash, key, keylen, salt); if (err) return err; |