From 187702efb90a06c8b90cbb64643d29956c286ec7 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 8 Jan 2020 09:45:59 -0700 Subject: [PATCH 1/2] bring sniffer.h inline with types.h --- wolfssl/sniffer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wolfssl/sniffer.h b/wolfssl/sniffer.h index 99ec96084..b5f9cb78b 100644 --- a/wolfssl/sniffer.h +++ b/wolfssl/sniffer.h @@ -98,7 +98,8 @@ enum { * information associated with the SSL session. */ -#if defined(__IAR_SYSTEMS_ICC__) || defined(__GNUC__) +#if (defined(__IAR_SYSTEMS_ICC__) && (__IAR_SYSTEMS_ICC__ > 8)) || \ + defined(__GNUC__) #define WOLFSSL_PACK __attribute__ ((packed)) #else #define WOLFSSL_PACK From 9760ed07a9fde3aca1762e6441e9939603f2264f Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Fri, 17 Jan 2020 12:27:46 -0700 Subject: [PATCH 2/2] Based on peer feedback, remove WOLFSSL_PACK from sniffer.h --- wolfssl/sniffer.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/wolfssl/sniffer.h b/wolfssl/sniffer.h index b5f9cb78b..519518f3c 100644 --- a/wolfssl/sniffer.h +++ b/wolfssl/sniffer.h @@ -98,14 +98,6 @@ enum { * information associated with the SSL session. */ -#if (defined(__IAR_SYSTEMS_ICC__) && (__IAR_SYSTEMS_ICC__ > 8)) || \ - defined(__GNUC__) - #define WOLFSSL_PACK __attribute__ ((packed)) -#else - #define WOLFSSL_PACK -#endif - - typedef struct SSLInfo { unsigned char isValid; @@ -118,7 +110,7 @@ typedef struct SSLInfo /* cipher name, e.g., "TLS_RSA_..." */ unsigned char serverNameIndication[128]; unsigned int keySize; -} WOLFSSL_PACK SSLInfo; +} SSLInfo; WOLFSSL_API