| commit | 254ae50a74d43ed8a7f248662d8f7fc350e87bbb | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Mon Dec 05 18:52:54 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 05 18:52:54 2022 +0000 |
| tree | e1409f8529e21caf1e021cde2ddc5c28bd04e91f | |
| parent | f5a6453bbb5743d55318ffcdf10ffd1488d50447 [diff] | |
| parent | 5ef66d4882905d90958a7e480a7fad3902a361ea [diff] |
Merge "Update the KeyMint version to 3" am: 633b9ba26b am: 6c29c112d3 am: 5ef66d4882 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>
diff --git a/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp b/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp index 7d58162..b696ff9 100644 --- a/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp +++ b/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp
@@ -91,7 +91,7 @@ } // namespace ScopedAStatus TrustyKeyMintDevice::getHardwareInfo(KeyMintHardwareInfo* info) { - info->versionNumber = 2; + info->versionNumber = 3; info->securityLevel = kSecurityLevel; info->keyMintName = "TrustyKeyMintDevice"; info->keyMintAuthorName = "Google";
diff --git a/trusty/keymaster/keymint/service.cpp b/trusty/keymaster/keymint/service.cpp index 3447b27..14549d2 100644 --- a/trusty/keymaster/keymint/service.cpp +++ b/trusty/keymaster/keymint/service.cpp
@@ -41,7 +41,7 @@ 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;