From 26041dc32bb5ae53b20b803483d7c586dccefd41 Mon Sep 17 00:00:00 2001 From: Florian Grandel Date: Fri, 19 May 2023 14:27:04 +0200 Subject: [PATCH] net: l2: ieee802154: fix typos A few security-related constants contained typos which are fixed in this change. Signed-off-by: Florian Grandel --- subsys/net/l2/ieee802154/ieee802154_frame.c | 22 ++++++++++----------- subsys/net/l2/ieee802154/ieee802154_frame.h | 14 ++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.c b/subsys/net/l2/ieee802154/ieee802154_frame.c index d3f19a7d977..08f89878584 100644 --- a/subsys/net/l2/ieee802154/ieee802154_frame.c +++ b/subsys/net/l2/ieee802154/ieee802154_frame.c @@ -32,9 +32,9 @@ LOG_MODULE_REGISTER(net_ieee802154_frame, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #define BUF_TIMEOUT K_MSEC(50) #ifdef CONFIG_NET_L2_IEEE802154_SECURITY -const uint8_t level_2_authtag_len[4] = {0, IEEE8021254_AUTH_TAG_LENGTH_32, - IEEE8021254_AUTH_TAG_LENGTH_64, - IEEE8021254_AUTH_TAG_LENGTH_128}; +const uint8_t level_2_authtag_len[4] = {0, IEEE802154_AUTH_TAG_LENGTH_32, + IEEE802154_AUTH_TAG_LENGTH_64, + IEEE802154_AUTH_TAG_LENGTH_128}; #endif struct ieee802154_fcf_seq *ieee802154_validate_fc_seq(uint8_t *buf, uint8_t **p_buf, @@ -153,7 +153,7 @@ ieee802154_validate_aux_security_hdr(uint8_t *buf, uint8_t **p_buf, uint8_t *len case IEEE802154_KEY_ID_MODE_IMPLICIT: break; case IEEE802154_KEY_ID_MODE_INDEX: - len += IEEE8021254_KEY_ID_FIELD_INDEX_LENGTH; + len += IEEE802154_KEY_ID_FIELD_INDEX_LENGTH; if (*length < len) { return NULL; } @@ -164,7 +164,7 @@ ieee802154_validate_aux_security_hdr(uint8_t *buf, uint8_t **p_buf, uint8_t *len break; case IEEE802154_KEY_ID_MODE_SRC_4_INDEX: - len += IEEE8021254_KEY_ID_FIELD_SRC_4_INDEX_LENGTH; + len += IEEE802154_KEY_ID_FIELD_SRC_4_INDEX_LENGTH; if (*length < len) { return NULL; } @@ -175,7 +175,7 @@ ieee802154_validate_aux_security_hdr(uint8_t *buf, uint8_t **p_buf, uint8_t *len break; case IEEE802154_KEY_ID_MODE_SRC_8_INDEX: - len += IEEE8021254_KEY_ID_FIELD_SRC_8_INDEX_LENGTH; + len += IEEE802154_KEY_ID_FIELD_SRC_8_INDEX_LENGTH; if (*length < len) { return NULL; } @@ -299,7 +299,7 @@ static inline bool validate_mac_command(struct ieee802154_mpdu *mpdu, uint8_t *b len += IEEE802154_CMD_DISASSOC_NOTE_LENGTH; } __fallthrough; - case IEEE802154_CFI_PAN_ID_CONLICT_NOTIFICATION: + case IEEE802154_CFI_PAN_ID_CONFLICT_NOTIFICATION: ar = 1U; comp = 1U; src_bf = BIT(IEEE802154_ADDR_MODE_EXTENDED); @@ -486,13 +486,13 @@ void ieee802154_compute_header_and_authtag_len(struct net_if *iface, struct net_ */ break; case IEEE802154_KEY_ID_MODE_INDEX: - hdr_len += IEEE8021254_KEY_ID_FIELD_INDEX_LENGTH; + hdr_len += IEEE802154_KEY_ID_FIELD_INDEX_LENGTH; break; case IEEE802154_KEY_ID_MODE_SRC_4_INDEX: - hdr_len += IEEE8021254_KEY_ID_FIELD_SRC_4_INDEX_LENGTH; + hdr_len += IEEE802154_KEY_ID_FIELD_SRC_4_INDEX_LENGTH; break; case IEEE802154_KEY_ID_MODE_SRC_8_INDEX: - hdr_len += IEEE8021254_KEY_ID_FIELD_SRC_8_INDEX_LENGTH; + hdr_len += IEEE802154_KEY_ID_FIELD_SRC_8_INDEX_LENGTH; } if (sec_ctx->level < IEEE802154_SECURITY_LEVEL_ENC) { @@ -781,7 +781,7 @@ static inline bool cfi_to_fs_settings(enum ieee802154_cfi cfi, struct ieee802154 break; case IEEE802154_CFI_ASSOCIATION_RESPONSE: - case IEEE802154_CFI_PAN_ID_CONLICT_NOTIFICATION: + case IEEE802154_CFI_PAN_ID_CONFLICT_NOTIFICATION: fs->fc.ar = 1U; fs->fc.pan_id_comp = 1U; fs->fc.src_addr_mode = IEEE802154_ADDR_MODE_EXTENDED; diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.h b/subsys/net/l2/ieee802154/ieee802154_frame.h index b9f75b73bba..a4051da6b00 100644 --- a/subsys/net/l2/ieee802154/ieee802154_frame.h +++ b/subsys/net/l2/ieee802154/ieee802154_frame.h @@ -144,9 +144,9 @@ enum ieee802154_security_level { #define IEEE802154_SECURITY_LEVEL_ENC IEEE802154_SECURITY_LEVEL_RESERVED /* This will match above *_MIC_<32/64/128> */ -#define IEEE8021254_AUTH_TAG_LENGTH_32 4 -#define IEEE8021254_AUTH_TAG_LENGTH_64 8 -#define IEEE8021254_AUTH_TAG_LENGTH_128 16 +#define IEEE802154_AUTH_TAG_LENGTH_32 4 +#define IEEE802154_AUTH_TAG_LENGTH_64 8 +#define IEEE802154_AUTH_TAG_LENGTH_128 16 /* See section 9.4.2.3, table 9-7 */ enum ieee802154_key_id_mode { @@ -156,9 +156,9 @@ enum ieee802154_key_id_mode { IEEE802154_KEY_ID_MODE_SRC_8_INDEX = 0x3, }; -#define IEEE8021254_KEY_ID_FIELD_INDEX_LENGTH 1 -#define IEEE8021254_KEY_ID_FIELD_SRC_4_INDEX_LENGTH 5 -#define IEEE8021254_KEY_ID_FIELD_SRC_8_INDEX_LENGTH 9 +#define IEEE802154_KEY_ID_FIELD_INDEX_LENGTH 1 +#define IEEE802154_KEY_ID_FIELD_SRC_4_INDEX_LENGTH 5 +#define IEEE802154_KEY_ID_FIELD_SRC_8_INDEX_LENGTH 9 #define IEEE802154_KEY_MAX_LEN 16 @@ -412,7 +412,7 @@ enum ieee802154_cfi { IEEE802154_CFI_ASSOCIATION_RESPONSE = 0x02, IEEE802154_CFI_DISASSOCIATION_NOTIFICATION = 0x03, IEEE802154_CFI_DATA_REQUEST = 0x04, - IEEE802154_CFI_PAN_ID_CONLICT_NOTIFICATION = 0x05, + IEEE802154_CFI_PAN_ID_CONFLICT_NOTIFICATION = 0x05, IEEE802154_CFI_ORPHAN_NOTIFICATION = 0x06, IEEE802154_CFI_BEACON_REQUEST = 0x07, IEEE802154_CFI_COORDINATOR_REALIGNEMENT = 0x08,