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

Skip to content
Commit 88205c5d authored by Neeraj Soni's avatar Neeraj Soni Committed by Gerrit - the friendly Code Review server
Browse files

Integrate the new file encryption framework

These changes integrate new file encryption framework to use new V2 encryption policies.

These changes were earlier reverted in 'commit 4211691d ("Reverting crypto and incrementalfs changes")',
as part of android-4.14.171 merge from Android common kernel. This patch attempts to bring them back
post validation.

commit a9a54506 ANDROID: dm: prevent default-key from being enabled without needed hooks
commit e1a94e6b ANDROID: dm: add dm-default-key target for metadata encryption
commit commit 232fd353 ANDROID: dm: enable may_passthrough_inline_crypto on some targets
commit 53bc059b ANDROID: dm: add support for passing through inline crypto support
commit aeed6db4 ANDROID: block: Introduce passthrough keyslot manager
commit 4f27c8b9 ANDROID: ext4, f2fs: enable direct I/O with inline encryption
commit c91db466 BACKPORT: FROMLIST: scsi: ufs: add program_key() variant op
commit f9a8e4a5 ANDROID: block: export symbols needed for modules to use inline crypto
commit 75fea5f6 ANDROID: block: fix some inline crypto bugs
commit 2871f731 ANDROID: fscrypt: add support for hardware-wrapped keys
commit bb5a6577 ANDROID: block: add KSM op to derive software secret from wrapped key
commit d42ba87e ANDROID: block: provide key size as input to inline crypto APIs
commit 86646ebb ANDROID: ufshcd-crypto: export cap find API
commit 83bc20ed ANDROID: scsi: ufs-qcom: Enable BROKEN_CRYPTO quirk flag
commit c266a131 ANDROID: scsi: ufs: Add quirk bit for controllers that don't play well with inline crypto
commit ea09b995 ANDROID: cuttlefish_defconfig: Enable blk-crypto fallback
commit e12563c1 BACKPORT: FROMLIST: Update Inline Encryption from v5 to v6 of patch series
commit 8e8f55d1 ANDROID: scsi: ufs: UFS init should not require inline crypto
commit dae98990 ANDROID: scsi: ufs: UFS crypto variant operations API
commit a69516d0 ANDROID: cuttlefish_defconfig: enable inline encryption
commit b8f7b236 BACKPORT: FROMLIST: ext4: add inline encryption support
commit e64327f5 BACKPORT: FROMLIST: f2fs: add inline encryption support
commit a0dc8da5 BACKPORT: FROMLIST: fscrypt: add inline encryption support
commit 19c3c628 BACKPORT: FROMLIST: scsi: ufs: Add inline encryption support to UFS
commit f858a998 BACKPORT: FROMLIST: scsi: ufs: UFS crypto API
commit 011b8344 BACKPORT: FROMLIST: scsi: ufs: UFS driver v2.1 spec crypto additions
commit ec0b569b BACKPORT: FROMLIST: block: blk-crypto for Inline Encryption
commit 760b3283 ANDROID: block: Fix bio_crypt_should_process WARN_ON
commit 138adbbe BACKPORT: FROMLIST: block: Add encryption context to struct bio
commit 66b56098 BACKPORT: FROMLIST: block: Keyslot Manager for Inline Encryption

Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android-4.14-stable


Git-commit: a9a54506
Git-commit: e1a94e6b
Git-commit: 232fd353
Git-commit: 53bc059b
Git-commit: aeed6db4
Git-commit: 4f27c8b9
Git-commit: c91db466
Git-commit: f9a8e4a5
Git-commit: 75fea5f6
Git-commit: 2871f731
Git-commit: bb5a6577
Git-commit: d42ba87e
Git-commit: 86646ebb
Git-commit: 83bc20ed
Git-commit: c266a131
Git-commit: ea09b995
Git-commit: e12563c1
Git-commit: 8e8f55d1
Git-commit: dae98990
Git-commit: a69516d0
Git-commit: b8f7b236
Git-commit: e64327f5
Git-commit: a0dc8da5
Git-commit: 19c3c628
Git-commit: f858a998
Git-commit: 011b8344
Git-commit: ec0b569b
Git-commit: 760b3283
Git-commit: 138adbbe
Git-commit: 66b56098

Change-Id: I171d90de41185824e0c7515f3a3b43ab88f4e058
Signed-off-by: default avatarNeeraj Soni <neersoni@codeaurora.org>
parent 7a42f09a
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