commit | ab80e707551d95b5e6f0924c0ebb6974e8fc3a69 | [log] [tgz] |
---|---|---|
author | android-build-prod (mdb) <android-build-team-robot@google.com> | Mon Oct 01 23:11:32 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 01 23:11:32 2018 +0000 |
tree | b69693e3645965019eccab22de470409f351a019 | |
parent | 5dce8b6609f630a91e3d5ccf2891612b0d1b24c9 [diff] | |
parent | f002f0ec133bc26eb8a1dd4a78c8aa56c7fc2081 [diff] |
Merge "Snap for 5042378 from 8d652af55d7cb154a21cd2601b46c33df030612b to pie-vts-release" into pie-vts-release
diff --git a/cryptfs.cpp b/cryptfs.cpp index 2ab3d09..c5024ae 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp
@@ -317,10 +317,6 @@ 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. };