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

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

Merge "Update message versionioning system" am: 00ed8bdd am: 438b5d03 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id10765be78869b71ed0cab74f1d4b59582f01a54
parents 069430b6 438b5d03

trusty/keymaster/set_attestation_key/set_attestation_key.cpp

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void parse_options(int argc, char** argv) { 
}



struct SetAttestationKeyRequest : public keymaster::KeymasterMessage {

    explicit SetAttestationKeyRequest(int32_t ver = keymaster::MAX_MESSAGE_VERSION)

    explicit SetAttestationKeyRequest(int32_t ver = keymaster::kDefaultMessageVersion)

        : KeymasterMessage(ver) {}



    size_t SerializedSize() const override { return sizeof(uint32_t) + key_data.SerializedSize(); }
@@ -88,7 +88,7 @@ struct SetAttestationKeyRequest : public keymaster::KeymasterMessage { 
};



struct KeymasterNoResponse : public keymaster::KeymasterResponse {

    explicit KeymasterNoResponse(int32_t ver = keymaster::MAX_MESSAGE_VERSION)

    explicit KeymasterNoResponse(int32_t ver = keymaster::kDefaultMessageVersion)

        : keymaster::KeymasterResponse(ver) {}



    size_t NonErrorSerializedSize() const override { return 0; }
@@ -99,7 +99,7 @@ struct KeymasterNoResponse : public keymaster::KeymasterResponse { 
struct SetAttestationKeyResponse : public KeymasterNoResponse {};



struct ClearAttestationCertChainRequest : public keymaster::KeymasterMessage {

    explicit ClearAttestationCertChainRequest(int32_t ver = keymaster::MAX_MESSAGE_VERSION)

    explicit ClearAttestationCertChainRequest(int32_t ver = keymaster::kDefaultMessageVersion)

        : KeymasterMessage(ver) {}



    size_t SerializedSize() const override { return sizeof(uint32_t); }