From: Greg Kaiser <gkaiser@google.com>
Date: Wed, 1 Aug 2018 20:15:19 +0000 (-0700)
Subject: cryptfs: Remove Speck support
X-Git-Tag: android-x86-9.0-r1~9^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=17059fe53b7f535886918d06fea58a90930862fc;p=android-x86%2Fsystem-vold.git

cryptfs: Remove Speck support

Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff521e95ed295f500e6529c52a994c9f) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
---

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 2ab3d09..c5024ae 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -317,10 +317,6 @@ constexpr CryptoType default_crypto_type = CryptoType()
 
 constexpr CryptoType supported_crypto_types[] = {
     default_crypto_type,
-    CryptoType()
-        .set_property_name("Speck128/128-XTS")
-        .set_crypto_name("speck128-xts-plain64")
-        .set_keysize(32),
     // Add new CryptoTypes here.  Order is not important.
 };