| commit | 5ef66d4882905d90958a7e480a7fad3902a361ea | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Mon Dec 05 18:12:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 05 18:12:07 2022 +0000 |
| tree | 392bd006fc05e33185806e24b92ae37e6b4d9da9 | |
| parent | 4fca97666db787cb691d8d4ae31a30d9ed2cdc86 [diff] | |
| parent | 6c29c112d3efb3c97ab913df746b042de5008278 [diff] |
Merge "Update the KeyMint version to 3" am: 633b9ba26b am: 6c29c112d3 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2294697 Change-Id: I1e6b2f5c2cb19db6eb05b5d22f9a71ffea77d855 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;