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

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

KeyMint HAL: pass auth token on updateAad am: 986a2dd9 

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



Change-Id: Id55c71c2ff97695851c8e9772c087035b2cc08c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f36a6ea7 986a2dd9

trusty/keymaster/keymint/TrustyKeyMintOperation.cpp

+5 −1
Original line number Diff line number Diff line
@@ -52,11 +52,15 @@ TrustyKeyMintOperation::~TrustyKeyMintOperation() { 
}



ScopedAStatus TrustyKeyMintOperation::updateAad(

        const vector<uint8_t>& input, const optional<HardwareAuthToken>& /* authToken */,

        const vector<uint8_t>& input, const optional<HardwareAuthToken>& authToken,

        const optional<TimeStampToken>& /* timestampToken */) {

    UpdateOperationRequest request(impl_->message_version());

    request.op_handle = opHandle_;

    request.additional_params.push_back(TAG_ASSOCIATED_DATA, input.data(), input.size());

    if (authToken) {

        auto tokenAsVec(authToken2AidlVec(*authToken));

        request.additional_params.push_back(TAG_AUTH_TOKEN, tokenAsVec.data(), tokenAsVec.size());

    }



    UpdateOperationResponse response(impl_->message_version());

    impl_->UpdateOperation(request, &response);