From 7a94a2ef7123ff5a94776656790957e7196b048a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@users.noreply.github.com>
Date: Fri, 26 Apr 2024 21:27:35 +0200
Subject: [PATCH] Enable kernel userspace crypto API interface for all
 platforms (#3330)

Enable libkcapi in generic kernel config. The bloat is minimal and the
options are enabled on most distributions. These modules are also needed
for Bluetooth Mesh and adding them fixes compatibility with some HCI USB
adapters.

Fixes #3322

(cherry picked from commit 67315f86d49ae117766491c366c68845ffa68548)
---
 buildroot-external/board/asus/tinker/kernel.config          | 5 -----
 buildroot-external/kernel/v6.6.y/hassos.config              | 6 ++++++
 .../kernel/v6.6.y/kernel-arm64-rockchip.config              | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/buildroot-external/board/asus/tinker/kernel.config b/buildroot-external/board/asus/tinker/kernel.config
index 84e955a96..6b108c724 100644
--- a/buildroot-external/board/asus/tinker/kernel.config
+++ b/buildroot-external/board/asus/tinker/kernel.config
@@ -1555,7 +1555,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_LSM="apparmor"
-CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_DH=m
@@ -1597,10 +1596,6 @@ CONFIG_CRYPTO_ZSTD=m
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
 CONFIG_CRYPTO_SHA1_ARM_CE=m
diff --git a/buildroot-external/kernel/v6.6.y/hassos.config b/buildroot-external/kernel/v6.6.y/hassos.config
index 826d0b382..76bae809a 100644
--- a/buildroot-external/kernel/v6.6.y/hassos.config
+++ b/buildroot-external/kernel/v6.6.y/hassos.config
@@ -64,6 +64,12 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
 
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_EFI_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
diff --git a/buildroot-external/kernel/v6.6.y/kernel-arm64-rockchip.config b/buildroot-external/kernel/v6.6.y/kernel-arm64-rockchip.config
index c6274b7dc..98394ee60 100644
--- a/buildroot-external/kernel/v6.6.y/kernel-arm64-rockchip.config
+++ b/buildroot-external/kernel/v6.6.y/kernel-arm64-rockchip.config
@@ -4086,7 +4086,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
 CONFIG_LSM="lockdown,yama,integrity,apparmor"
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
@@ -4136,10 +4135,6 @@ CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_NHPOLY1305_NEON=y
 CONFIG_CRYPTO_CHACHA20_NEON=y