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

Commit e785a25f authored Nov 15, 2021 by Alistair Delva

Revert "ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC"



This reverts commit 05137329.

Reason for revert: tests will be dropped from gsi

Change-Id: I435df6e02114a3e66591f2f6d2d2136d7893842a
Signed-off-by: Alistair Delva <adelva@google.com>

parent bfb2ce3e

arch/arm64/configs/gki_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -558,9 +558,7 @@ 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

+0 −2

Original line number	Diff line number	Diff line
		@@ -486,9 +486,7 @@ 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