From ae049706c6a1eb2953888a77547ff8fa8c96c80f Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Tue, 23 Aug 2022 11:57:41 +0200 Subject: [PATCH] Remove WOLFSSL_GENERAL_ALIGNMENT from WOLFSSL_TICKET_ENC_SZ calculation --- wolfssl/internal.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/wolfssl/internal.h b/wolfssl/internal.h index eec7eda15..ce69937ce 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -2743,15 +2743,8 @@ typedef struct InternalTicket { #define WOLFSSL_TICKET_EXTRA_PADDING_SZ 32 #endif -#if defined(WOLFSSL_GENERAL_ALIGNMENT) && WOLFSSL_GENERAL_ALIGNMENT > 0 - /* round up to WOLFSSL_GENERAL_ALIGNMENT */ - #define WOLFSSL_TICKET_ENC_SZ \ - (((sizeof(InternalTicket) + WOLFSSL_TICKET_EXTRA_PADDING_SZ) + \ - WOLFSSL_GENERAL_ALIGNMENT - 1) & ~(WOLFSSL_GENERAL_ALIGNMENT-1)) -#else - #define WOLFSSL_TICKET_ENC_SZ \ - (sizeof(InternalTicket) + WOLFSSL_TICKET_EXTRA_PADDING_SZ) -#endif +#define WOLFSSL_TICKET_ENC_SZ \ + (sizeof(InternalTicket) + WOLFSSL_TICKET_EXTRA_PADDING_SZ) /* RFC 5077 defines this for session tickets. All members need to be a byte or * array of byte to avoid alignment issues */