commit e750c56852dfb02aefd0bd7a61901fd4972d3767
author Bill Rassieur <rassb@google.com> Wed Oct 10 17:32:39 2018 +0000
committer Bill Rassieur <rassb@google.com> Wed Oct 10 17:32:39 2018 +0000
tree aa9708dbfdb012393cde80a59aa0405881d4fbca
parent a4c6bbd8cbf27b6b33aed46eb163a58299d094b5
parent 9d680761912ab259ffd35b05c880b9e49d800bc8

Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.

Change-Id: I33214d649d8c198193394f9a1551c17485ce1f68
BUG: 117431430

ext4_utils/ext4_crypt.cpp

diff --git a/ext4_utils/ext4_crypt.cpp b/ext4_utils/ext4_crypt.cpp
index 5ec8723..36fe11f 100644
--- a/ext4_utils/ext4_crypt.cpp
+++ b/ext4_utils/ext4_crypt.cpp
@@ -52,8 +52,6 @@
 
 #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 @@
     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 @@
 
     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 {