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

Commit 2365aa38 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Allow any mode in DICE chains for other functions" into main am: 71bbd7e4 am: 754c45e7 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3433602



Change-Id: Idd79b26f5f78cb42241e51087d7d8442d8f8ac4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fe2617f 754c45e7

security/keymint/support/remote_prov_utils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ ErrMsgOr<bool> compareRootPublicKeysInDiceChains(const std::vector<uint8_t>& enc 
    }



    auto csr1 = hwtrust::Csr::validate(encodedCsr1, *diceChainKind, false /*isFactory*/,

                                       false /*allowAnyMode*/, deviceSuffix(instanceName1));

                                       true /*allowAnyMode*/, deviceSuffix(instanceName1));

    if (!csr1.ok()) {

        return csr1.error().message();

    }
@@ -921,7 +921,7 @@ ErrMsgOr<bool> compareRootPublicKeysInDiceChains(const std::vector<uint8_t>& enc 
    }



    auto csr2 = hwtrust::Csr::validate(encodedCsr2, *diceChainKind, false /*isFactory*/,

                                       false /*allowAnyMode*/, deviceSuffix(instanceName2));

                                       true /*allowAnyMode*/, deviceSuffix(instanceName2));

    if (!csr2.ok()) {

        return csr2.error().message();

    }
@@ -952,7 +952,7 @@ ErrMsgOr<bool> verifyComponentNameInKeyMintDiceChain(const std::vector<uint8_t>& 
    }



    auto csr = hwtrust::Csr::validate(encodedCsr, *diceChainKind, false /*isFactory*/,

                                      false /*allowAnyMode*/, deviceSuffix(DEFAULT_INSTANCE_NAME));

                                      true /*allowAnyMode*/, deviceSuffix(DEFAULT_INSTANCE_NAME));

    if (!csr.ok()) {

        return csr.error().message();

    }