diff options
| author | dianlujitao <dianlujitao@lineageos.org> | 2019-09-15 19:46:14 +0800 |
|---|---|---|
| committer | dianlujitao <dianlujitao@lineageos.org> | 2020-01-02 17:13:26 +0200 |
| commit | 59da9910b3a6da545a690643bec9252ab800a3d7 (patch) | |
| tree | a490e04ff8a5f9ac98f1b942bbaea4187ab9658a | |
| parent | 3916cd8173f627bb7a93246353a224395e196711 (diff) | |
| download | system_core-59da9910b3a6da545a690643bec9252ab800a3d7.tar.gz system_core-59da9910b3a6da545a690643bec9252ab800a3d7.tar.bz2 system_core-59da9910b3a6da545a690643bec9252ab800a3d7.zip | |
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
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 1 | ||||
| -rw-r--r-- | fs_mgr/include_fstab/fstab/fstab.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 7df7cfd99..783b12920 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -211,6 +211,7 @@ void ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) { CheckFlag("first_stage_mount", first_stage_mount); CheckFlag("slotselect_other", slot_select_other); CheckFlag("fsverity", fs_verity); + 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 d7afed654..8e2996948 100644 --- a/fs_mgr/include_fstab/fstab/fstab.h +++ b/fs_mgr/include_fstab/fstab/fstab.h @@ -84,6 +84,7 @@ struct FstabEntry { bool first_stage_mount : 1; bool slot_select_other : 1; bool fs_verity : 1; + bool wrapped_key : 1; } fs_mgr_flags = {}; bool is_encryptable() const { |