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

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

Merge "Correct the UDS_pub source" into main am: 52ed6c34 

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



Change-Id: I57ca171b73123aa3452ae2686e3c966768b618f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75618b43 52ed6c34

security/keymint/support/remote_prov_utils.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1040,14 +1040,15 @@ ErrMsgOr<bytevec> parseAndValidateAuthenticatedRequest(const std::vector<uint8_t 
        return diceContents.message() + "\n" + prettyPrint(diceCertChain);

    }



    auto& udsPub = diceContents->back().pubKey;

    auto udsPub = diceCertChain->get(0)->asMap()->encode();

    auto& kmDiceKey = diceContents->back().pubKey;



    auto error = validateUdsCerts(*udsCerts, udsPub);

    if (!error.empty()) {

        return error;

    }



    auto signedPayload = verifyAndParseCoseSign1(signedData, udsPub, {} /* aad */);

    auto signedPayload = verifyAndParseCoseSign1(signedData, kmDiceKey, {} /* aad */);

    if (!signedPayload) {

        return signedPayload.message();

    }