From e640bc1b88bd7505d4eab1133a292e46ffc8a1b0 Mon Sep 17 00:00:00 2001 From: Paul Crowley Date: Fri, 30 Mar 2018 09:44:53 -0700 Subject: [PATCH] Support Speck encryption. Test: Modified Pixel to support and use Speck encryption, booted. Bug: 77227248 Change-Id: I6ec272db5e4f16e9dd4f759203c14ad2a8772cd1 Merged-In: I6ec272db5e4f16e9dd4f759203c14ad2a8772cd1 --- fs_mgr/fs_mgr_fstab.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 72a65d264..3fbef9fc2 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -116,17 +116,21 @@ static struct flag_list fs_mgr_flags[] = { #define EM_ICE 2 #define EM_AES_256_CTS 3 #define EM_AES_256_HEH 4 +#define EM_SPECK_128_256_XTS 5 +#define EM_SPECK_128_256_CTS 6 static const struct flag_list file_contents_encryption_modes[] = { {"aes-256-xts", EM_AES_256_XTS}, + {"speck128/256-xts", EM_SPECK_128_256_XTS}, {"software", EM_AES_256_XTS}, /* alias for backwards compatibility */ - {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */ + {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */ {0, 0}, }; static const struct flag_list file_names_encryption_modes[] = { {"aes-256-cts", EM_AES_256_CTS}, {"aes-256-heh", EM_AES_256_HEH}, + {"speck128/256-cts", EM_SPECK_128_256_CTS}, {0, 0}, };