From dc4f4046b76e9e6998dac44737c421d54c60353d Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Mon, 20 May 2019 17:02:02 -0700 Subject: [PATCH] Revert "ANDROID: cuttlefish 4.19: enable CONFIG_CRYPTO_AES_NI_INTEL=y" This reverts commit 4ff44333686cd96e92dd3b48d5af024d5e8593f4. Temporarily reverting this valid change as the crypto subsystem has bugs that are uncovered by CFI, and landing CFI right now is more important. Bug: 133186739 Change-Id: Ic103313cf4a3631170d71aa513dee85ed6cb3b71 Signed-off-by: Alistair Strachan --- arch/x86/configs/x86_64_cuttlefish_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index b3bf6c725b97..45bd184c0ff2 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -458,7 +458,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_ADIANTUM=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_DEV_VIRTIO=y