| commit | fb259857120124e82e0bcc84eee9fae070ce4dc8 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Dec 16 10:44:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 16 10:44:11 2021 +0000 |
| tree | d3e05b3cc13cb4e35f030a5d4568e8351ce8eb7e | |
| parent | bddb9e7b34ee8132b080c1b82a5f74ba06a0325a [diff] | |
| parent | f7eed000de4f5b676a1ab36067c150f6600e480c [diff] |
Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000de Original change: https://android-review.googlesource.com/c/platform/system/core/+/1910047 Change-Id: I451ef8b033388f7b817b56464bd6dec5e0798640
diff --git a/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp b/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp index 5f8524b..68a7912 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 = 1; + info->versionNumber = 2; info->securityLevel = kSecurityLevel; info->keyMintName = "TrustyKeyMintDevice"; info->keyMintAuthorName = "Google";
diff --git a/trusty/keymaster/keymint/service.cpp b/trusty/keymaster/keymint/service.cpp index d5a77fb..3447b27 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_1); + int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMINT_2); if (err != 0) { LOG(FATAL) << "Could not initialize TrustyKeymaster for KeyMint (" << err << ")"; return -1;