diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 11:17:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 11:17:39 -0700 |
| commit | 93235e3df29c084a37e0daed17801c6adfce4cb6 (patch) | |
| tree | fa69253ba2d70050522e605e2b089e5888fa9223 /arch/arm | |
| parent | 787af64d05cd528aac9ad16752d11bb1c6061bb9 (diff) | |
| parent | aa8e73eed7d3084c18dd16d195748661c7e881b5 (diff) | |
Merge tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Missing Kconfig dependency on arm that leads to boot failure
- x86 SLS fixes
- Reference leak in the stm32 driver
* tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: x86/sm3 - Fixup SLS
crypto: x86/poly1305 - Fixup SLS
crypto: x86/chacha20 - Avoid spurious jumps to other functions
crypto: stm32 - fix reference leak in stm32_crc_remove
crypto: arm/aes-neonbs-cbc - Select generic cbc and aes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/crypto/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig index 2b575792363e..e4dba5461cb3 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -102,6 +102,8 @@ config CRYPTO_AES_ARM_BS depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER select CRYPTO_LIB_AES + select CRYPTO_AES + select CRYPTO_CBC select CRYPTO_SIMD help Use a faster and more secure NEON based implementation of AES in CBC, |