ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000de

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1910047

Change-Id: I451ef8b033388f7b817b56464bd6dec5e0798640
This commit is contained in:
David Drysdale 2021-12-16 10:44:11 +00:00 • committed by Automerger Merge Worker
commit fb25985712
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trusty/keymaster/keymint/TrustyKeyMintDevice.cpp
View file

@ -91,7 +91,7 @@ void addClientAndAppData(const vector<uint8_t>& clientId, const vector<uint8_t>&
} // namespace
ScopedAStatus TrustyKeyMintDevice::getHardwareInfo(KeyMintHardwareInfo* info) {
info->versionNumber = 1;
info->versionNumber = 2;
info->securityLevel = kSecurityLevel;
info->keyMintName = "TrustyKeyMintDevice";
info->keyMintAuthorName = "Google";

2
trusty/keymaster/keymint/service.cpp
View file

@ -41,7 +41,7 @@ std::shared_ptr<T> addService(Args&&... args) {
int main() {
auto trustyKeymaster = std::make_shared<keymaster::TrustyKeymaster>();
int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMINT_1);
int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMINT_2);
if (err != 0) {
LOG(FATAL) << "Could not initialize TrustyKeymaster for KeyMint (" << err << ")";
return -1;