Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c29c112 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Update the KeyMint version to 3" am: 633b9ba2 

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



Change-Id: Ib02ac9f1e8b36c7f3ad9ecb367de271beb41de43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 127abfa0 633b9ba2

trusty/keymaster/keymint/TrustyKeyMintDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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";

trusty/keymaster/keymint/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;