| commit | 58a08fdd4373cc4f1ed4f618a4697c7060e01aae | [log] [tgz] |
|---|---|---|
| author | dianlujitao <dianlujitao@lineageos.org> | Sun Sep 15 19:46:14 2019 +0800 |
| committer | micky387 <mickaelsaibi@free.fr> | Sat Sep 21 16:31:21 2024 -0400 |
| tree | eb5afb28fe0037da6ef87bc3e952a71d7abb026b | |
| parent | fc7bc8c4bfb4c6095e34ea784509dae56f25b486 [diff] |
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 <wight554@gmail.com>
diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp index f00e0dc..35d5696 100644 --- a/fs_mgr/libfstab/fstab.cpp +++ b/fs_mgr/libfstab/fstab.cpp
@@ -206,6 +206,7 @@ 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 1696daf..d01753b 100644 --- a/fs_mgr/libfstab/include/fstab/fstab.h +++ b/fs_mgr/libfstab/include/fstab/fstab.h
@@ -86,6 +86,7 @@ bool fs_compress : 1; bool overlayfs_remove_missing_lowerdir : 1; bool is_zoned : 1; + bool wrapped_key : 1; } fs_mgr_flags = {}; bool is_encryptable() const { return fs_mgr_flags.crypt; }