diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:03:03 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:03:03 +0000 |
| commit | 8d652af55d7cb154a21cd2601b46c33df030612b (patch) | |
| tree | b69693e3645965019eccab22de470409f351a019 | |
| parent | 5dce8b6609f630a91e3d5ccf2891612b0d1b24c9 (diff) | |
| parent | 2b927c0ce7acf9fb9e996e3f97bf641dc6d5d8f9 (diff) | |
| download | vold-pie-s2-release.tar.gz | |
Merge cherrypicks of [4793300, 4793320, 4793321, 4793340, 4793322, 4793061, 4793323, 4793324, 4793325, 4793380, 4793341, 4793342, 4793343, 4793265, 4793131, 4793132, 4793266, 4793133, 4793134, 4793400, 4793229, 4793381, 4793382, 4793383, 4793384, 4793385, 4793386, 4793387, 4793388, 4793062, 4793105, 4793063, 4793135, 4793389, 4793420] into pi-releaseandroid-9.0.0_r9android-9.0.0_r17pie-s2-releasepie-release
Change-Id: If84640cb8069e49b16a69aa59577a9e0f69acb64
| -rw-r--r-- | cryptfs.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cryptfs.cpp b/cryptfs.cpp index 2ab3d09b..c5024aeb 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. }; |