From b0b804dc3d0bc7b15182c4d2e8c43ecbcbd1f350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= Date: Mon, 11 Mar 2019 17:45:15 +0200 Subject: [PATCH] Corrected security protocol data alignment --- source/Security/protocols/sec_prot.h | 4 +++- source/Security/protocols/tls_sec_prot/tls_sec_prot.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/Security/protocols/sec_prot.h b/source/Security/protocols/sec_prot.h index 47c3648b271..59929a7217f 100644 --- a/source/Security/protocols/sec_prot.h +++ b/source/Security/protocols/sec_prot.h @@ -217,6 +217,8 @@ typedef sec_prot_t *sec_prot_by_type_get(sec_prot_t *prot, uint8_t type); */ typedef void sec_prot_receive_disable(sec_prot_t *prot); +typedef struct sec_prot_int_data_s sec_prot_int_data_t; + // Security protocol data struct sec_prot_s { sec_prot_create_request *create_req; /**< Create request */ @@ -246,7 +248,7 @@ struct sec_prot_s { sec_prot_keys_t *sec_keys; /**< Security keys storage pointer */ uint8_t header_size; /**< Header size */ - uint8_t data; /**< Protocol internal data */ + sec_prot_int_data_t *data; /**< Protocol internal data */ }; #endif /* SEC_PROT_H_ */ diff --git a/source/Security/protocols/tls_sec_prot/tls_sec_prot.c b/source/Security/protocols/tls_sec_prot/tls_sec_prot.c index d385445f20c..04a191c529a 100644 --- a/source/Security/protocols/tls_sec_prot/tls_sec_prot.c +++ b/source/Security/protocols/tls_sec_prot/tls_sec_prot.c @@ -54,6 +54,8 @@ typedef enum { TLS_STATE_FINISHED = SEC_STATE_FINISHED } eap_tls_sec_prot_state_e; +typedef struct tls_sec_prot_lib_int_s tls_sec_prot_lib_int_t; + typedef struct { sec_prot_common_t common; /**< Common data */ uint8_t new_pmk[PMK_LEN]; /**< New Pair Wise Master Key */ @@ -64,7 +66,7 @@ typedef struct { bool timer_running; /**< TLS timer running */ bool finished; /**< TLS finished */ bool calculating; /**< TLS is calculating */ - uint8_t tls_sec_inst; /**< TLS security library storage, SHALL BE THE LAST FIELD */ + tls_sec_prot_lib_int_t *tls_sec_inst; /**< TLS security library storage, SHALL BE THE LAST FIELD */ } tls_sec_prot_int_t; static uint16_t tls_sec_prot_size(void);