commit 1797c6976fdc4e475a5fcba18ede7fde395ea21b
author android-build-team Robot <android-build-team-robot@google.com> Wed Aug 08 03:08:33 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Aug 08 03:08:33 2018 +0000
tree 1c76bbb0922d53896dd561604936000f6fa57a1d
parent 0673f0ba26a7754494b013c95cdb8b342da23a87
parent 270e90f033dd412206697e3a27aee76c24038c33

Snap for 4939496 from 270e90f033dd412206697e3a27aee76c24038c33 to pi-qpr1-release

Change-Id: I58c840b601d31afc4b161d62a28052f71460e906

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 68cc530..c9fb7aa 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -114,21 +114,17 @@
 #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},
 };