From 73d9b65afb0c3d57691582e4427b08e928f52234 Mon Sep 17 00:00:00 2001 From: Stefan Hristozov Date: Sun, 5 Nov 2023 18:59:06 +0100 Subject: [PATCH] use MAX() macro to compute buffer sizes --- inc/edhoc/buffer_sizes.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/inc/edhoc/buffer_sizes.h b/inc/edhoc/buffer_sizes.h index cdc34b2b..14398049 100644 --- a/inc/edhoc/buffer_sizes.h +++ b/inc/edhoc/buffer_sizes.h @@ -90,17 +90,9 @@ #define MSG12_MAX MAX(MSG_1_SIZE, MSG_2_SIZE) #define MSG34_MAX MAX(MSG_3_SIZE, MSG_4_SIZE) #define MSG_MAX_SIZE MAX(MSG12_MAX, MSG34_MAX) - -#define PLAINTEXT23_MAX_SIZE \ - (((PLAINTEXT2_SIZE) > (PLAINTEXT3_SIZE)) ? (PLAINTEXT2_SIZE) : \ - (PLAINTEXT3_SIZE)) - -#define CRED_MAX_SIZE \ - (((CRED_R_SIZE) > (CRED_I_SIZE)) ? (CRED_R_SIZE) : (CRED_I_SIZE)) - -#define ID_CRED_MAX_SIZE \ - (((ID_CRED_R_SIZE) > (ID_CRED_I_SIZE)) ? (ID_CRED_R_SIZE) : \ - (ID_CRED_I_SIZE)) +#define PLAINTEXT23_MAX_SIZE MAX(PLAINTEXT2_SIZE, PLAINTEXT3_SIZE) +#define CRED_MAX_SIZE MAX(CRED_R_SIZE, CRED_I_SIZE) +#define ID_CRED_MAX_SIZE MAX(ID_CRED_R_SIZE, ID_CRED_I_SIZE) #define SIG_STRUCT_SIZE \ ((2 + HASH_SIZE) + COSE_SIGN1_STR_LEN + ID_CRED_MAX_SIZE + \