From 051373292befa1ae003649404789adb3951270b9 Mon Sep 17 00:00:00 2001 From: evitayan Date: Mon, 20 Jul 2020 10:40:39 -0700 Subject: [PATCH] ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC To be able to use ChaCha20Poly1305 and AES-XCBC in IPsec Bug: 161717358 Bug: 204402327 Change-Id: Ifeeb3d1f3458d46491ba6cd363656bf4737b5cd3 Signed-off-by: Yan Yan Signed-off-by: evitayan Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 2d7ae7b614213b28b6cd6230104e1f5f723e81df) --- 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 cd9c8da3b259..1ed0c750f483 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -558,7 +558,9 @@ CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y +CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ZSTD=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 67a8c6119273..ab3db4763b6e 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -486,7 +486,9 @@ CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y +CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_SHA256_SSSE3=y CONFIG_CRYPTO_AES_NI_INTEL=y