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

Merge "Update the KeyMint version to 3" am: 633b9ba26b am: 6c29c112d3 am: 5ef66d4882

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

Change-Id: I2460b4ea0da87d11355c8ac3663a597c0d650c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eran Messeri 2022-12-05 18:52:54 +00:00 • committed by Automerger Merge Worker
commit 254ae50a74
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 = 2;
info->versionNumber = 3;
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_2);
int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMINT_3);
if (err != 0) {
LOG(FATAL) << "Could not initialize TrustyKeymaster for KeyMint (" << err << ")";
return -1;