Skip to content

Commit a5ff990

Browse files
moetayukoersascape
authored andcommitted
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 9f03019) Signed-off-by: Volodymyr Zhdanov <wight554@gmail.com>
1 parent e8a1b2d commit a5ff990

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

fs_mgr/fs_mgr_fstab.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ void ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
181181
CheckFlag("fsverity", fs_verity);
182182
CheckFlag("metadata_csum", ext_meta_csum);
183183
CheckFlag("fscompress", fs_compress);
184+
CheckFlag("wrappedkey", wrapped_key);
184185

185186
#undef CheckFlag
186187

fs_mgr/include_fstab/fstab/fstab.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ struct FstabEntry {
8686
bool fs_verity : 1;
8787
bool ext_meta_csum : 1;
8888
bool fs_compress : 1;
89+
bool wrapped_key : 1;
8990
} fs_mgr_flags = {};
9091

9192
bool is_encryptable() const {

0 commit comments

Comments
 (0)