diff options
author | Bill Rassieur <rassb@google.com> | 2018-10-10 17:27:51 +0000 |
---|---|---|
committer | Bill Rassieur <rassb@google.com> | 2018-10-10 17:27:51 +0000 |
commit | 4da9048b80708d978636e8afed084f621f185719 (patch) | |
tree | fb21d3853cf808701b80962e249d52fd85d0dadf | |
parent | 0fac9018f2388f25f5a5778663a14712e75a9903 (diff) | |
parent | c9602275fc7dae822d22ba36c933d29f4556d6aa (diff) | |
download | core-4da9048b80708d978636e8afed084f621f185719.tar.gz |
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1
Change-Id: I398364a59b493057139bdfd5de6b5070978c44bb
BUG: 117431430
-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}, }; |