diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-07 10:57:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-07 10:57:14 -0700 |
commit | e60bd99e21a31895365d24377fd89b57e838d363 (patch) | |
tree | 3e3632f0c16332206be2fdeea42a4f0db3141ac6 /crypto/akcipher.c | |
parent | a6ac85f8956e28d3421787157822ed218036d6f2 (diff) | |
parent | a56cdee6589d1ea73db1c2b32d79d227e05da5c9 (diff) | |
download | linux-crypto-e60bd99e21a31895365d24377fd89b57e838d363.tar.gz linux-crypto-e60bd99e21a31895365d24377fd89b57e838d363.zip |
Merge tag 'v6.4-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- A long-standing bug in crypto_engine
- A buggy but harmless check in the sun8i-ss driver
- A regression in the CRYPTO_USER interface
* tag 'v6.4-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: api - Fix CRYPTO_USER checks for report function
crypto: engine - fix crypto_queue backlog handling
crypto: sun8i-ss - Fix a test in sun8i_ss_setup_ivs()
Diffstat (limited to 'crypto/akcipher.c')
-rw-r--r-- | crypto/akcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/akcipher.c b/crypto/akcipher.c index 186e762b..7960ceb5 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -98,7 +98,7 @@ static const struct crypto_type crypto_akcipher_type = { #ifdef CONFIG_PROC_FS .show = crypto_akcipher_show, #endif -#ifdef CONFIG_CRYPTO_USER +#if IS_ENABLED(CONFIG_CRYPTO_USER) .report = crypto_akcipher_report, #endif #ifdef CONFIG_CRYPTO_STATS |