diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-08 06:36:20 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-08 06:36:20 +0000 |
| commit | 7d3cccdfbdc7bb94ad55730a6269ae98c3703e93 (patch) | |
| tree | 9bdce3f8116b2d678f9d5ddce02f390cd82d2791 | |
| parent | b8d86c0051a0113659edf2bf7ea80b6d318e01f5 (diff) | |
| parent | fa9ce0e4a240d50fde168369c2095d1e14241a97 (diff) | |
| download | extras-7d3cccdfbdc7bb94ad55730a6269ae98c3703e93.tar.gz | |
Snap for 4939858 from fa9ce0e4a240d50fde168369c2095d1e14241a97 to pi-b4s4-release
Change-Id: I86394b596ae3a88285858e475fbbd362e622f890
| -rw-r--r-- | ext4_utils/ext4_crypt.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ext4_utils/ext4_crypt.cpp b/ext4_utils/ext4_crypt.cpp index 5ec8723b..36fe11f7 100644 --- a/ext4_utils/ext4_crypt.cpp +++ b/ext4_utils/ext4_crypt.cpp @@ -52,8 +52,6 @@ struct ext4_encryption_policy { #define EXT4_ENCRYPTION_MODE_AES_256_XTS 1 #define EXT4_ENCRYPTION_MODE_AES_256_CTS 4 -#define EXT4_ENCRYPTION_MODE_SPECK128_256_XTS 7 -#define EXT4_ENCRYPTION_MODE_SPECK128_256_CTS 8 #define EXT4_ENCRYPTION_MODE_AES_256_HEH 126 #define EXT4_ENCRYPTION_MODE_PRIVATE 127 @@ -260,8 +258,6 @@ int e4crypt_policy_ensure(const char *directory, const char *policy, if (!strcmp(contents_encryption_mode, "software") || !strcmp(contents_encryption_mode, "aes-256-xts")) { contents_mode = EXT4_ENCRYPTION_MODE_AES_256_XTS; - } else if (!strcmp(contents_encryption_mode, "speck128/256-xts")) { - contents_mode = EXT4_ENCRYPTION_MODE_SPECK128_256_XTS; } else if (!strcmp(contents_encryption_mode, "ice")) { contents_mode = EXT4_ENCRYPTION_MODE_PRIVATE; } else { @@ -272,8 +268,6 @@ int e4crypt_policy_ensure(const char *directory, const char *policy, if (!strcmp(filenames_encryption_mode, "aes-256-cts")) { filenames_mode = EXT4_ENCRYPTION_MODE_AES_256_CTS; - } else if (!strcmp(filenames_encryption_mode, "speck128/256-cts")) { - filenames_mode = EXT4_ENCRYPTION_MODE_SPECK128_256_CTS; } else if (!strcmp(filenames_encryption_mode, "aes-256-heh")) { filenames_mode = EXT4_ENCRYPTION_MODE_AES_256_HEH; } else { |