diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-10-12 18:00:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 18:00:30 +0000 |
commit | d73b4572aecd4cc3903a618bd26508a9ff0dc0b3 (patch) | |
tree | b69693e3645965019eccab22de470409f351a019 | |
parent | 5dce8b6609f630a91e3d5ccf2891612b0d1b24c9 (diff) | |
parent | 2fd4ac57beaf4181cce5baf6fd0bea3244601f9a (diff) | |
download | vold-pie-cts-release.tar.gz |
Merge "Snap for 5063321 from 8d652af55d7cb154a21cd2601b46c33df030612b to pie-cts-release" into pie-cts-releaseandroid-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r20android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10pie-cts-release
-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. }; |