Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 34f21ff3 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

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:

114c59d6 ANDROID: f2fs: fix possible merge of unencrypted with encrypted I/O
3a468438 ANDROID: scsi: ufs-qcom: Enable BROKEN_CRYPTO quirk flag
6f915cf2 ANDROID: scsi: ufs-hisi: Enable BROKEN_CRYPTO quirk flag
86739e75 ANDROID: scsi: ufs: Add quirk bit for controllers that don't play well with inline crypto
d2e05e75 ANDROID: scsi: ufs: UFS init should not require inline crypto
484f1873 ANDROID: scsi: ufs: UFS crypto variant operations API
f269cf51 ANDROID: gki_defconfig: enable inline encryption
f2ca2620 BACKPORT: FROMLIST: ext4: add inline encryption support
e274bd38 BACKPORT: FROMLIST: f2fs: add inline encryption support
07973695 BACKPORT: FROMLIST: fscrypt: add inline encryption support
a502a18f BACKPORT: FROMLIST: scsi: ufs: Add inline encryption support to UFS
eedb6251 BACKPORT: FROMLIST: scsi: ufs: UFS crypto API
e00aafee BACKPORT: FROMLIST: scsi: ufs: UFS driver v2.1 spec crypto additions
392ad89e BACKPORT: FROMLIST: block: blk-crypto for Inline Encryption
8fda3053 ANDROID: block: Fix bio_crypt_should_process WARN_ON
20efc30a BACKPORT: FROMLIST: block: Add encryption context to struct bio
b0a4fb22 BACKPORT: FROMLIST: block: Keyslot Manager for Inline Encryption
2fedb52d FROMLIST: f2fs: add support for IV_INO_LBLK_64 encryption policies
11fd3752 FROMLIST: ext4: add support for IV_INO_LBLK_64 encryption policies
94231712 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_64 policies
6806fd6a FROMLIST: fscrypt: zeroize fscrypt_info before freeing
97c9fb77 FROMLIST: fscrypt: remove struct fscrypt_ctx
65901127 BACKPORT: FROMLIST: fscrypt: invoke crypto API for ESSIV handling
651f77d3 ANDROID: sdcardfs: evict dentries on fscrypt key removal
4932f537 ANDROID: fscrypt: add key removal notifier chain
45b1509e ext4 crypto: fix to check feature status before get policy
c0751a1b fscrypt: document the new ioctls and policy version
435089d6 ubifs: wire up new fscrypt ioctls
c80449de f2fs: wire up new fscrypt ioctls
8178d688 ext4: wire up new fscrypt ioctls
30d0df15 fscrypt: require that key be added when setting a v2 encryption policy
080389cb fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS ioctl
8e1c8874 fscrypt: allow unprivileged users to add/remove keys for v2 policies
73ce50dc fscrypt: v2 encryption policy support
6ad6af59 fscrypt: add an HKDF-SHA512 implementation
dbfc6584 fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl
cacc84e0 fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl
98462559 fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl
c677e577 fscrypt: rename keyinfo.c to keysetup.c
43d52193 fscrypt: move v1 policy key setup to keysetup_v1.c
c55916aa fscrypt: refactor key setup code in preparation for v2 policies
d4b1cd7a fscrypt: rename fscrypt_master_key to fscrypt_direct_key
3246be13 fscrypt: add ->ci_inode to fscrypt_info
fc987b38 fscrypt: use FSCRYPT_* definitions, not FS_*
678ee276 fscrypt: use FSCRYPT_ prefix for uapi constants
a48b7adc fs, fscrypt: move uapi definitions to new header <linux/fscrypt.h>
932301a5 fscrypt: use ENOPKG when crypto API support missing
60f50d13 fscrypt: improve warnings for missing crypto API support
830d573a fscrypt: improve warning messages for unsupported encryption contexts
9aa799b7 fscrypt: make fscrypt_msg() take inode instead of super_block
10c0af12 fscrypt: clean up base64 encoding/decoding
9842574a fscrypt: remove loadable module related code

Change-Id: I12036285cc65adcf79ff96ccf980408c8267c957
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 45417b13
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment