From 69c2fa5ed29225c0cd9290c963336a401a806b2d Mon Sep 17 00:00:00 2001 From: Nathan Huckleberry Date: Tue, 16 Aug 2022 18:47:23 +0000 Subject: [PATCH] ANDROID: GKI: Enable HCTR2 HCTR2 is a wide-block encryption mode intended to solve a pre-existing cryptographic weakness due to IV reuse in filename encryption. Bug: 233652475 Change-Id: Ie1bcff8d61579a6b3e14418f280b97483b2dd670 Signed-off-by: Nathan Huckleberry --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 65f61153f065..02da9100b070 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -77,6 +77,7 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_SHA512_ARM64_CE=y +CONFIG_CRYPTO_POLYVAL_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y @@ -634,6 +635,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y +CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_MD5=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 1858eaad1142..f53ab5a2fbbf 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -573,8 +573,10 @@ CONFIG_SECURITY_SELINUX=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y +CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_BLAKE2B=y +CONFIG_CRYPTO_POLYVAL_CLMUL_NI=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA256_SSSE3=y CONFIG_CRYPTO_SHA512_SSSE3=y