| commit | ba4a3df072c9aa21ec46d18d215e204ecbc62231 | [log] [tgz] |
|---|---|---|
| author | dianlujitao <dianlujitao@lineageos.org> | Sun Sep 15 19:46:14 2019 +0800 |
| committer | Jackeagle <jackeagle102@gmail.com> | Tue Apr 06 11:49:23 2021 +0200 |
| tree | 87f0fbc707a5a483241cee8107fb04bd248dd794 | |
| parent | 68602a181d16901f4e05b547609794f10eb8622c [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. Change-Id: Ibdf035e548c3f5085401f60df158c9a327947f33 (cherry picked from commit 9f03019be92a1ce86910ef20e6372a4785ba56c1)
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 8a22078..2d59579 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -178,6 +178,7 @@ CheckFlag("slotselect_other", slot_select_other); CheckFlag("fsverity", fs_verity); CheckFlag("metadata_csum", ext_meta_csum); + CheckFlag("wrappedkey", wrapped_key); #undef CheckFlag
diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h index 7cf4f89..736b904 100644 --- a/fs_mgr/include_fstab/fstab/fstab.h +++ b/fs_mgr/include_fstab/fstab/fstab.h
@@ -83,6 +83,7 @@ bool slot_select_other : 1; bool fs_verity : 1; bool ext_meta_csum : 1; + bool wrapped_key : 1; } fs_mgr_flags = {}; bool is_encryptable() const {