Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05137329 authored by evitayan's avatar evitayan Committed by Maciej Żenczykowski
Browse files

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: default avatarYan Yan <evitayan@google.com>
Signed-off-by: default avatarevitayan <evitayan@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 2d7ae7b614213b28b6cd6230104e1f5f723e81df)
parent 55cb12f0

arch/arm64/configs/gki_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/configs/gki_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -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