Skip to content

Commit

Permalink
Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
divegeek authored and Android (Google) Code Review committed Aug 12, 2021
2 parents 8f19fd9 + 2bab97c commit 90c818d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 27 deletions.
13 changes: 0 additions & 13 deletions Keymaster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,18 +230,5 @@ void Keymaster::earlyBootEnded() {
logKeystore2ExceptionIfPresent(rc, "earlyBootEnded");
}

void Keymaster::deleteAllKeys() {
::ndk::SpAIBinder binder(AServiceManager_getService(maintenance_service_name));
auto maint_service = ks2_maint::IKeystoreMaintenance::fromBinder(binder);

if (!maint_service) {
LOG(ERROR) << "Unable to connect to keystore2 maintenance service for deleteAllKeys";
return;
}

auto rc = maint_service->deleteAllKeys();
logKeystore2ExceptionIfPresent(rc, "deleteAllKeys");
}

} // namespace vold
} // namespace android
3 changes: 0 additions & 3 deletions Keymaster.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ class Keymaster {
// be created or used.
static void earlyBootEnded();

// Tell all Keymint devices to delete all rollback-protected keys.
static void deleteAllKeys();

private:
std::shared_ptr<ks2::IKeystoreSecurityLevel> securityLevel;
DISALLOW_COPY_AND_ASSIGN(Keymaster);
Expand Down
11 changes: 0 additions & 11 deletions MetadataCrypt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,6 @@ static bool read_key(const std::string& metadata_key_dir, const KeyGeneration& g
auto dir = metadata_key_dir + "/key";
LOG(DEBUG) << "metadata_key_dir/key: " << dir;
if (!MkdirsSync(dir, 0700)) return false;
if (!pathExists(dir)) {
auto delete_all = android::base::GetBoolProperty(
"ro.crypto.metadata_init_delete_all_keys.enabled", false);
if (delete_all) {
LOG(INFO) << "Metadata key does not exist, calling deleteAllKeys";
Keymaster::deleteAllKeys();
} else {
LOG(DEBUG) << "Metadata key does not exist but "
"ro.crypto.metadata_init_delete_all_keys.enabled is false";
}
}
auto temp = metadata_key_dir + "/tmp";
return retrieveOrGenerateKey(dir, temp, kEmptyAuthentication, gen, key);
}
Expand Down

0 comments on commit 90c818d

Please sign in to comment.