From d9ec0e18f42249b32fb2c82ab3a0e15cb74d018d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 5 Jun 2025 11:41:29 +0900 Subject: [PATCH] ANDROID: CONFIG_CRYPTO_SHA1_ARM64_CE=y to GKI and Microdroid kernel We have been using SHA1 for Mainline updates. Although we should deprecate SHA1 for the obvious reasons, it needs a deeper and wider surgery around the Mainline build & release infra. As long as we use SHA1, we need to use the HW-accelerated SHA1 implementation wherever it is available. Bug: 420452426 Test: zcat /proc/config.gz | grep SHA1_ARM64 Change-Id: Icb86ca2d955e01285e41532ffaa57c9768a58aa5 Signed-off-by: Jiyong Park (cherry picked from commit e9d50375f715543181e0fdceaa816302319dc8a4) --- arch/arm64/configs/gki_defconfig | 1 + arch/arm64/configs/microdroid_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + arch/x86/configs/microdroid_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 1de2ad0b0bdf..aee331a1430b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -737,6 +737,7 @@ CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_SHA512_ARM64_CE=y CONFIG_CRYPTO_POLYVAL_ARM64_CE=y diff --git a/arch/arm64/configs/microdroid_defconfig b/arch/arm64/configs/microdroid_defconfig index 8235166a55af..2d67e00899b5 100644 --- a/arch/arm64/configs/microdroid_defconfig +++ b/arch/arm64/configs/microdroid_defconfig @@ -141,6 +141,7 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_POLYVAL_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 5da55f8d4a16..c7bd6055c20b 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -672,6 +672,7 @@ CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_POLYVAL_CLMUL_NI=y +CONFIG_CRYPTO_SHA1_SSSE3=y CONFIG_CRYPTO_SHA256_SSSE3=y CONFIG_CRYPTO_SHA512_SSSE3=y CONFIG_CRC_CCITT=y diff --git a/arch/x86/configs/microdroid_defconfig b/arch/x86/configs/microdroid_defconfig index d58c3dc697d0..0f0326bd4400 100644 --- a/arch/x86/configs/microdroid_defconfig +++ b/arch/x86/configs/microdroid_defconfig @@ -209,6 +209,7 @@ CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_POLYVAL_CLMUL_NI=y +CONFIG_CRYPTO_SHA1_SSSE3=y CONFIG_CRYPTO_SHA256_SSSE3=y CONFIG_CRYPTO_SHA512_SSSE3=y CONFIG_PRINTK_TIME=y