From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Dec 2018 23:52:27 +0000 (+0000)
Subject: kernel: Make all crypto acceleration a module
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d80cb086ccd489efa1eea5c5a149039855dcf0c8;p=ipfire-3.x.git

kernel: Make all crypto acceleration a module

This will allow a slightly smaller kernel on many systems that
do not have any support for any crypto acceleration.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 8221b82ac..5c870297e 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -761,17 +761,6 @@ CONFIG_ARM_PMU=y
 #
 CONFIG_MESON_MX_EFUSE=m
 
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_SIMD=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_LRW=m
-
 #
 # Library routines
 #
diff --git a/kernel/config-generic b/kernel/config-generic
index 9323ab40b..1e974e186 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -5553,6 +5553,7 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
@@ -5560,6 +5561,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
@@ -5580,12 +5582,13 @@ CONFIG_CRYPTO_ECHAINIV=m
 # Block modes
 #
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_OFB=y
-CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_KEYWRAP=m
 
@@ -5665,11 +5668,10 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_USER_API_RNG=y
-CONFIG_CRYPTO_USER_API_AEAD=y
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_USER_API_RNG is not set
+# CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_CHELSIO=m
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 23f224516..08111ced9 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -1568,9 +1568,7 @@ CONFIG_INTEL_TXT=y
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -1582,15 +1580,10 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=y
 # CONFIG_CRYPTO_MORUS1280_SSE2 is not set
 # CONFIG_CRYPTO_MORUS1280_AVX2 is not set
 
-#
-# Block modes
-#
-CONFIG_CRYPTO_LRW=y
-
 #
 # Digest
 #
-CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_POLY1305_X86_64=m
@@ -1602,8 +1595,8 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 #
 # Ciphers
 #
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 267e232de..13d235e46 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.20
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>