From 4f45dc3a7eab936357564816d8e6fb37154a4d05 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Sun, 13 Dec 2020 10:55:24 -0700 Subject: [PATCH] Update message versionioning system Bug: 171845787 Test: Build Change-Id: Ie769113070a8a755a268f65e36384fe333c798b6 --- .../keymaster/set_attestation_key/set_attestation_key.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trusty/keymaster/set_attestation_key/set_attestation_key.cpp b/trusty/keymaster/set_attestation_key/set_attestation_key.cpp index 6f74833f6..df6b0f833 100644 --- a/trusty/keymaster/set_attestation_key/set_attestation_key.cpp +++ b/trusty/keymaster/set_attestation_key/set_attestation_key.cpp @@ -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); }