diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-07 21:11:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 21:11:51 +0000 |
| commit | 4ea2e5dbe0af7a5dd8e9f6f5499d3e9d4646610c (patch) | |
| tree | 431d70a2a03b16a6310e282ba69016d18ef5e621 | |
| parent | 5303cae8baa34fc709005af08dcc1af34a6c1d42 (diff) | |
| parent | 06f45020fda004508824bef06139e5992d6e0493 (diff) | |
| download | extras-android-o-mr1-iot-release-1.0.3.tar.gz | |
Merge "Revert "Support Speck encryption.""android-o-mr1-iot-release-1.0.3
| -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 { |