Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert crypto changes from android-4.19.79-95
This is a preparation change for merging android-4.19.95 into msm-4.19 branch. The following changes are reverted. They will be introduced to msm-4.19 at later stage: 114c59d ANDROID: f2fs: fix possible merge of unencrypted with encrypted I/O 3a46843 ANDROID: scsi: ufs-qcom: Enable BROKEN_CRYPTO quirk flag 6f915cf ANDROID: scsi: ufs-hisi: Enable BROKEN_CRYPTO quirk flag 86739e7 ANDROID: scsi: ufs: Add quirk bit for controllers that don't play well with inline crypto d2e05e7 ANDROID: scsi: ufs: UFS init should not require inline crypto 484f187 ANDROID: scsi: ufs: UFS crypto variant operations API f269cf5 ANDROID: gki_defconfig: enable inline encryption f2ca262 BACKPORT: FROMLIST: ext4: add inline encryption support e274bd3 BACKPORT: FROMLIST: f2fs: add inline encryption support 0797369 BACKPORT: FROMLIST: fscrypt: add inline encryption support a502a18 BACKPORT: FROMLIST: scsi: ufs: Add inline encryption support to UFS eedb625 BACKPORT: FROMLIST: scsi: ufs: UFS crypto API e00aafe BACKPORT: FROMLIST: scsi: ufs: UFS driver v2.1 spec crypto additions 392ad89 BACKPORT: FROMLIST: block: blk-crypto for Inline Encryption 8fda305 ANDROID: block: Fix bio_crypt_should_process WARN_ON 20efc30 BACKPORT: FROMLIST: block: Add encryption context to struct bio b0a4fb2 BACKPORT: FROMLIST: block: Keyslot Manager for Inline Encryption 2fedb52 FROMLIST: f2fs: add support for IV_INO_LBLK_64 encryption policies 11fd375 FROMLIST: ext4: add support for IV_INO_LBLK_64 encryption policies 9423171 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_64 policies 6806fd6 FROMLIST: fscrypt: zeroize fscrypt_info before freeing 97c9fb7 FROMLIST: fscrypt: remove struct fscrypt_ctx 6590112 BACKPORT: FROMLIST: fscrypt: invoke crypto API for ESSIV handling 651f77d ANDROID: sdcardfs: evict dentries on fscrypt key removal 4932f53 ANDROID: fscrypt: add key removal notifier chain 45b1509 ext4 crypto: fix to check feature status before get policy c0751a1 fscrypt: document the new ioctls and policy version 435089d ubifs: wire up new fscrypt ioctls c80449d f2fs: wire up new fscrypt ioctls 8178d68 ext4: wire up new fscrypt ioctls 30d0df1 fscrypt: require that key be added when setting a v2 encryption policy 080389c fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS ioctl 8e1c887 fscrypt: allow unprivileged users to add/remove keys for v2 policies 73ce50d fscrypt: v2 encryption policy support 6ad6af5 fscrypt: add an HKDF-SHA512 implementation dbfc658 fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl cacc84e fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl 9846255 fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl c677e57 fscrypt: rename keyinfo.c to keysetup.c 43d5219 fscrypt: move v1 policy key setup to keysetup_v1.c c55916a fscrypt: refactor key setup code in preparation for v2 policies d4b1cd7 fscrypt: rename fscrypt_master_key to fscrypt_direct_key 3246be1 fscrypt: add ->ci_inode to fscrypt_info fc987b3 fscrypt: use FSCRYPT_* definitions, not FS_* 678ee27 fscrypt: use FSCRYPT_ prefix for uapi constants a48b7ad fs, fscrypt: move uapi definitions to new header <linux/fscrypt.h> 932301a fscrypt: use ENOPKG when crypto API support missing 60f50d1 fscrypt: improve warnings for missing crypto API support 830d573 fscrypt: improve warning messages for unsupported encryption contexts 9aa799b fscrypt: make fscrypt_msg() take inode instead of super_block 10c0af1 fscrypt: clean up base64 encoding/decoding 9842574 fscrypt: remove loadable module related code Change-Id: I12036285cc65adcf79ff96ccf980408c8267c957 Signed-off-by: Ivaylo Georgiev <[email protected]> Signed-off-by: Blagovest Kolenichev <[email protected]>
- Loading branch information