deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

TSCH: fix indentation in tsch-packet.c

Browse source
This commit is contained in:
Yasuyuki Tanaka 2016-12-15 17:06:48 +01:00
parent 38ff8e5283
commit da853386a6
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/net/mac/tsch/tsch-security.c
View file

@ -120,8 +120,9 @@ tsch_security_check_level(const frame802154_t *frame)
required_key_index = TSCH_SECURITY_KEY_INDEX_OTHER; required_key_index = TSCH_SECURITY_KEY_INDEX_OTHER;
break; break;
} }
return frame->aux_hdr.security_control.security_level == required_security_level return ((frame->aux_hdr.security_control.security_level ==
&& frame->aux_hdr.key_index == required_key_index; required_security_level) &&
frame->aux_hdr.key_index == required_key_index);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
@ -192,8 +193,7 @@ tsch_security_secure_frame(uint8_t *hdr, uint8_t *outbuf,
CCM_STAR.aead(nonce, CCM_STAR.aead(nonce,
outbuf + a_len, m_len, outbuf + a_len, m_len,
outbuf, a_len, outbuf, a_len,
outbuf + hdrlen + datalen, mic_len, 1 outbuf + hdrlen + datalen, mic_len, 1);
);
return mic_len; return mic_len;
} }
@ -250,8 +250,7 @@ tsch_security_parse_frame(const uint8_t *hdr, int hdrlen, int datalen,
CCM_STAR.aead(nonce, CCM_STAR.aead(nonce,
(uint8_t *)hdr + a_len, m_len, (uint8_t *)hdr + a_len, m_len,
(uint8_t *)hdr, a_len, (uint8_t *)hdr, a_len,
generated_mic, mic_len, 0 generated_mic, mic_len, 0);
);
if(mic_len > 0 && memcmp(generated_mic, hdr + hdrlen + datalen, mic_len) != 0) { if(mic_len > 0 && memcmp(generated_mic, hdr + hdrlen + datalen, mic_len) != 0) {
return 0; return 0;

3
core/net/mac/tsch/tsch-security.h
View file

@ -137,6 +137,7 @@ int tsch_security_secure_frame(uint8_t *hdr, uint8_t *outbuf,
* \retval 1 On success or no need for security check (good frame) * \retval 1 On success or no need for security check (good frame)
*/ */
int tsch_security_parse_frame(const uint8_t *hdr, int hdrlen, int datalen, int tsch_security_parse_frame(const uint8_t *hdr, int hdrlen, int datalen,
const frame802154_t *frame, const linkaddr_t *sender, struct asn_t *asn); const frame802154_t *frame,
const linkaddr_t *sender, struct asn_t *asn);
#endif /* __TSCH_SECURITY_H__ */ #endif /* __TSCH_SECURITY_H__ */