From 8bb1e0ca2d954871b6cd8ab67f97dec2669c5df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Tue, 27 Feb 2024 12:58:14 +0100 Subject: [PATCH] fix(data-formats): Use correct CBOR serializer for Error messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use `serde_tuple` to serialize/deserialize the error messages as a CBOR arrays instead of a CBOR maps as described in the FIDO Device Onboard Specification. Fixes: #620 Signed-off-by: Miguel Martín --- data-formats/src/messages/v10/error.rs | 4 ++-- data-formats/src/messages/v11/error.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data-formats/src/messages/v10/error.rs b/data-formats/src/messages/v10/error.rs index 30d9d4ca0..eea95f042 100644 --- a/data-formats/src/messages/v10/error.rs +++ b/data-formats/src/messages/v10/error.rs @@ -1,11 +1,11 @@ -use serde::{Deserialize, Serialize}; +use serde_tuple::{Deserialize_tuple, Serialize_tuple}; use crate::{ constants::{ErrorCode, MessageType}, messages::{ClientMessage, EncryptionRequirement, Message, ServerMessage}, }; -#[derive(Debug, Serialize, Deserialize)] +#[derive(Debug, Serialize_tuple, Deserialize_tuple)] pub struct ErrorMessage { error_code: ErrorCode, previous_message_type: MessageType, diff --git a/data-formats/src/messages/v11/error.rs b/data-formats/src/messages/v11/error.rs index 6699ec7ef..af1771919 100644 --- a/data-formats/src/messages/v11/error.rs +++ b/data-formats/src/messages/v11/error.rs @@ -1,11 +1,11 @@ -use serde::{Deserialize, Serialize}; +use serde_tuple::{Deserialize_tuple, Serialize_tuple}; use crate::{ constants::{ErrorCode, MessageType}, messages::{ClientMessage, EncryptionRequirement, Message, ServerMessage}, }; -#[derive(Debug, Serialize, Deserialize)] +#[derive(Debug, Serialize_tuple, Deserialize_tuple)] pub struct ErrorMessage { error_code: ErrorCode, previous_message_type: MessageType,