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

Commit fb259857 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000 

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

Change-Id: I451ef8b033388f7b817b56464bd6dec5e0798640
parents bddb9e7b f7eed000

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 = 1;

    info->versionNumber = 2;

    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_1);

    int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMINT_2);

    if (err != 0) {

        LOG(FATAL) << "Could not initialize TrustyKeymaster for KeyMint (" << err << ")";

        return -1;