summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-08-16 11:03:19 -0500
committerandroid-build-team Robot2018-08-16 11:03:19 -0500
commite6bf5255dade7c21a58074473e6c29b4c84f11ee (patch)
treefb21d3853cf808701b80962e249d52fd85d0dadf
parent0fac9018f2388f25f5a5778663a14712e75a9903 (diff)
parent1d50319e1269c807a7e854606123ca86820cf644 (diff)
downloadplatform-system-core-pie-release.tar.gz
platform-system-core-pie-release.tar.xz
platform-system-core-pie-release.zip
Merge cherrypicks of [4793300, 4793320, 4793321, 4793340, 4793322, 4793061, 4793323, 4793324, 4793325, 4793380, 4793341, 4793342, 4793343, 4793265, 4793131, 4793132, 4793266, 4793133, 4793134, 4793400, 4793229, 4793381, 4793382, 4793383, 4793384, 4793385, 4793386, 4793387, 4793388, 4793062, 4793105, 4793063, 4793135, 4793389, 4793420] into pi-releaseandroid-9.0.0_r9android-9.0.0_r17pie-release
Change-Id: I38c87aedcef5ea651486d1c4bad3811aa09931a3
-rw-r--r--fs_mgr/fs_mgr_fstab.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 68cc530dd..c9fb7aa57 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -114,21 +114,17 @@ static struct flag_list fs_mgr_flags[] = {
114#define EM_ICE 2 114#define EM_ICE 2
115#define EM_AES_256_CTS 3 115#define EM_AES_256_CTS 3
116#define EM_AES_256_HEH 4 116#define EM_AES_256_HEH 4
117#define EM_SPECK_128_256_XTS 5
118#define EM_SPECK_128_256_CTS 6
119 117
120static const struct flag_list file_contents_encryption_modes[] = { 118static const struct flag_list file_contents_encryption_modes[] = {
121 {"aes-256-xts", EM_AES_256_XTS}, 119 {"aes-256-xts", EM_AES_256_XTS},
122 {"speck128/256-xts", EM_SPECK_128_256_XTS},
123 {"software", EM_AES_256_XTS}, /* alias for backwards compatibility */ 120 {"software", EM_AES_256_XTS}, /* alias for backwards compatibility */
124 {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */ 121 {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */
125 {0, 0}, 122 {0, 0},
126}; 123};
127 124
128static const struct flag_list file_names_encryption_modes[] = { 125static const struct flag_list file_names_encryption_modes[] = {
129 {"aes-256-cts", EM_AES_256_CTS}, 126 {"aes-256-cts", EM_AES_256_CTS},
130 {"aes-256-heh", EM_AES_256_HEH}, 127 {"aes-256-heh", EM_AES_256_HEH},
131 {"speck128/256-cts", EM_SPECK_128_256_CTS},
132 {0, 0}, 128 {0, 0},
133}; 129};
134 130