| commit | 1e81807b183f08c9b7a68d225afff8b9ffb60fbe | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Sun Jun 30 06:20:30 2024 +0000 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Jul 03 02:59:38 2024 +0000 |
| tree | b1cf416218fcac4d63485c1d79eb17492e2bfafb | |
| parent | 43668e40b3b3365e0a4a0a1aea8dc05b16130707 [diff] |
RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand() Adds deleteSecrets() to RecoverySystemService. This method is called from rebootRecoveryWithCommand () before the --wipe_data command is passed to recovery and the device is force-rebooted. deleteSecerts() calls IKeystoreMaintenance.deleteAllKeys() in order to quickly destroy the keys protecting the synthetic password blobs used to derive FBE encryption keys. The intent is to make FBE-encrypted data unrecoverable even if the full data wipe in recovery is interrupted or skipped. Bug: 324321147 Test: Manual - System -> Reset options -> Erase all data. Test: Hold VolDown key to interrupt reboot and stop at bootloader screen. Test: fastboot oem bcd wipe command && fastboot oem bcd wipe recovery Test: fastboot reboot Test: Device reboots into recovery and prompts to factory reset: Test: 'Cannot load Android system. Your data may be corrupt. ...' (cherry picked from https://android-review.googlesource.com/q/commit:0d00031851e9f5d8ef93947205a7e8b5257f0d8d) Ignore-AOSP-First: Security fix backport (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9cdf9eae2e02a6c3651379c33c4655368b009d13) Merged-In: I5eb8e97f3ae1a18d5e7e7c2c7eca048ebff3440a Change-Id: I5eb8e97f3ae1a18d5e7e7c2c7eca048ebff3440a