TODO: Fix decryption issue.

cd-Crypton · Dec 3, 2022 · 1156d9a · 1156d9a
1 parent b380185
commit 1156d9a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -97,6 +97,7 @@ BOARD_INCLUDE_RECOVERY_DTBO := true
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/root/system/etc/recovery.fstab
 TARGET_SYSTEM_PROP := $(DEVICE_PATH)/system.prop
+TARGET_VENDOR_PROP := $(DEVICE_PATH)/vendor.prop
 
 # Additional binaries & libraries needed for recovery
 TARGET_RECOVERY_DEVICE_MODULES += \

diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab
@@ -8,6 +8,6 @@
 
 # Other Partitions
 /dev/block/by-name/metadata         /metadata       ext4                            noatime,nosuid,nodev,discard wait,check,formattable
-/dev/block/by-name/userdata         /data           f2fs                            noatime,nosuid,nodev,discard,noflush_merge,fsync_mode=nobarrier,reserve_root=134217,resgid=1065,inlinecrypt wait,check,formattable,quota,resize,fileencryption=aes-256-xts:aes-256-cts:v1
+/dev/block/by-name/userdata         /data           f2fs                            noatime,nosuid,nodev,discard,noflush_merge,fsync_mode=nobarrier,reserve_root=134217,resgid=1065,inlinecrypt wait,check,formattable,quota,resize,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota
 /dev/block/by-name/cache            /cache          ext4                            noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable
 /dev/block/by-name/misc             /misc           emmc                            flags=display=misc
diff --git a/recovery/root/system/lib64/android.hardware.keymaster@4.0-service.rc b/recovery/root/system/lib64/android.hardware.keymaster@4.0-service.rc
diff --git a/recovery/root/system/lib64/libQSEEComAPI.so b/recovery/root/system/lib64/libQSEEComAPI.so
diff --git a/recovery/root/vendor/lib64/libkeymaster41.so b/recovery/root/vendor/lib64/libkeymaster41.so
diff --git a/recovery/root/vendor/lib64/libkeymaster4_1support.so b/recovery/root/vendor/lib64/libkeymaster4_1support.so
diff --git a/system.prop b/system.prop
@@ -7,6 +7,5 @@ ro.mtk_soter_support=1
 ro.adb.secure=0
 ro.boot.avb_version=2.0
 ro.boot.vbmeta.avb_version=2.0
-ro.crypto.volume.filenames_mode=aes-256-cts
 ro.hardware.gatekeeper=beanpod
 persist.sys.timezone=Asia/Manila
diff --git a/vendor.prop b/vendor.prop
@@ -0,0 +1,5 @@
+# Crypto
+ro.crypto.allow_encrypt_override=true
+ro.crypto.dm_default_key.options_format.version=2
+ro.crypto.volume.filenames_mode=aes-256-cts
+ro.crypto.volume.metadata.method=dm-default-key