diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:41:32 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:41:32 +0000 |
commit | c9602275fc7dae822d22ba36c933d29f4556d6aa (patch) | |
tree | fb21d3853cf808701b80962e249d52fd85d0dadf | |
parent | 0fac9018f2388f25f5a5778663a14712e75a9903 (diff) | |
parent | d8e76e1e4379ddedf20a839d6123714fc53a140f (diff) | |
download | core-pie-r2-s2-release.tar.gz |
Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-release
Change-Id: Ia75958a7ea990a00967dbc876fcd5fdd0339fb85
-rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 6 |
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[] = { #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}, }; |