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

Commit 633b9ba2 authored by Eran Messeri's avatar Eran Messeri Committed by Gerrit Code Review
Browse files

Merge "Update the KeyMint version to 3"

parents c4108e91 e3450660

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;