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

Commit d0385380 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow any mode when checking DICE chain" into main am: 46b26654 am: 915fe666 

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



Change-Id: I2c13c9e07aa87f61617eaaabf96b8da80f01286f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e14868ac 915fe666

security/keymint/support/remote_prov_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ ErrMsgOr<bool> isCsrWithProperDiceChain(const std::vector<uint8_t>& encodedCsr, 
    }



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

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

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

    if (!csr.ok()) {

        return csr.error().message();

    }