diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2018-08-06 20:32:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-06 20:32:08 +0000 |
| commit | d5e3509a370b51b7964ad577018016e40458b350 (patch) | |
| tree | 2335d5b65fc6626d935f11b9d3f0fd6606d7cfc3 | |
| parent | 2ee7d5fddfd437f35159ebe0db2127913a3a85a7 (diff) | |
| parent | ddd34f7b85ea6701d0c62f1e7c6cb98bbef60738 (diff) | |
Merge "fs_mgr: Wrapped key support for FBE" into p-keystone-qcom
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 68cc530dd..0677e3d4b 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -116,12 +116,14 @@ static struct flag_list fs_mgr_flags[] = { #define EM_AES_256_HEH 4 #define EM_SPECK_128_256_XTS 5 #define EM_SPECK_128_256_CTS 6 +#define EM_ICE_WRAPPED_KEY_SUPPORTED 7 static const struct flag_list file_contents_encryption_modes[] = { {"aes-256-xts", EM_AES_256_XTS}, {"speck128/256-xts", EM_SPECK_128_256_XTS}, {"software", EM_AES_256_XTS}, /* alias for backwards compatibility */ {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */ + {"ice_wrapped_key_supported", EM_ICE_WRAPPED_KEY_SUPPORTED}, /* ICE engine with wrapped key support */ {0, 0}, }; |