diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-11-09 17:04:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-11-09 17:04:58 -0800 |
| commit | 3b220413438184b352b297e7cf593fa56999b5b3 (patch) | |
| tree | 563012c81c08bea63542fbe46f5f4055b2ba76b9 /crypto/ahash.c | |
| parent | Merge tag 'input-for-v6.7-rc0' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | crypto: ahash - Set using_shash for cloned ahash wrapper over shash (diff) | |
| download | linux-3b220413438184b352b297e7cf593fa56999b5b3.tar.gz linux-3b220413438184b352b297e7cf593fa56999b5b3.tar.bz2 linux-3b220413438184b352b297e7cf593fa56999b5b3.zip | |
Merge tag 'v6.7-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a regression in ahash and hides the Kconfig sub-options for
the jitter RNG"
* tag 'v6.7-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ahash - Set using_shash for cloned ahash wrapper over shash
crypto: jitterentropy - Hide esoteric Kconfig options under FIPS and EXPERT
Diffstat (limited to 'crypto/ahash.c')
| -rw-r--r-- | crypto/ahash.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index deee55f939dc..80c3e5354711 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -651,6 +651,7 @@ struct crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash) err = PTR_ERR(shash); goto out_free_nhash; } + nhash->using_shash = true; *nctx = shash; return nhash; } |