From 95f29b767804fb1987ccffd424263ae04fcb5819 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sun, 15 Sep 2019 19:46:14 +0800 Subject: [PATCH] Add wrapped key support These commits added wrapped key support: https://source.codeaurora.org/quic/la/platform/system/core/commit/?h=LA.UM.8.1.r1-08800-sm8150.0&id=ddd34f7b85ea6701d0c62f1e7c6cb98bbef60738 https://source.codeaurora.org/quic/la/platform/system/core/commit/?h=LA.UM.8.1.r1-08800-sm8150.0&id=98ee612a86f40a862889347a4f3bb6231fcdb0e0 https://source.codeaurora.org/quic/la/platform/system/core/commit/?h=LA.UM.8.1.r1-08800-sm8150.0&id=c69050ee52338339f0eb1a07aa3eeeeeb2e209d9 Although, got either reverted by follow-ups or removed after the big Q merge commit: https://source.codeaurora.org/quic/la/platform/system/core/commit/?h=LA.UM.8.1.r1-08800-sm8150.0&id=dd28b6d7f1f44a529a2262d09834da4ca48937f4 Bring in the relevant bits so that system/vold part compiles. Conflicts: fs_mgr/fs_mgr_fstab.cpp fs_mgr/include_fstab/fstab/fstab.h Change-Id: Ibdf035e548c3f5085401f60df158c9a327947f33 (cherry picked from commit 9f03019be92a1ce86910ef20e6372a4785ba56c1) Signed-off-by: Volodymyr Zhdanov Signed-off-by: zlewchan --- fs_mgr/libfstab/fstab.cpp | 1 + fs_mgr/libfstab/include/fstab/fstab.h | 1 + 2 files changed, 2 insertions(+) diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp index f00e0dc26..35d5696aa 100644 --- a/fs_mgr/libfstab/fstab.cpp +++ b/fs_mgr/libfstab/fstab.cpp @@ -206,6 +206,7 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) { CheckFlag("metadata_csum", ext_meta_csum); CheckFlag("fscompress", fs_compress); CheckFlag("overlayfs_remove_missing_lowerdir", overlayfs_remove_missing_lowerdir); + CheckFlag("wrappedkey", wrapped_key); #undef CheckFlag diff --git a/fs_mgr/libfstab/include/fstab/fstab.h b/fs_mgr/libfstab/include/fstab/fstab.h index 1696daff0..236d584ec 100644 --- a/fs_mgr/libfstab/include/fstab/fstab.h +++ b/fs_mgr/libfstab/include/fstab/fstab.h @@ -85,6 +85,7 @@ struct FstabEntry { bool ext_meta_csum : 1; bool fs_compress : 1; bool overlayfs_remove_missing_lowerdir : 1; + bool wrapped_key : 1; bool is_zoned : 1; } fs_mgr_flags = {};