giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #572 from lafka/lafka-include-guards

Browse Source 
Add guards for service-specific includes in contik-main
This commit is contained in:
George Oikonomou 2018-06-19 16:03:08 +01:00 committed by GitHub
commit cc37ae5851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/net/mac/tsch/tsch-security.c
View File

@ -53,6 +53,10 @@
#include <stdio.h>
#include <string.h>
#if LLSEC802154_ENABLED && !LLSEC802154_USES_EXPLICIT_KEYS
#error LLSEC802154_ENABLED set but LLSEC802154_USES_EXPLICIT_KEYS unset
#endif /* LLSEC802154_ENABLED */
/* The two keys K1 and K2 from 6TiSCH minimal configuration
* K1: well-known, used for EBs
* K2: secret, used for data and ACK

4
os/net/mac/tsch/tsch-security.h
View File

@ -54,10 +54,6 @@
* - set LLSEC802154_CONF_USES_EXPLICIT_KEYS
* */
#if LLSEC802154_ENABLED && !LLSEC802154_USES_EXPLICIT_KEYS
#error LLSEC802154_ENABLED set but LLSEC802154_USES_EXPLICIT_KEYS unset
#endif /* LLSEC802154_ENABLED */
/* K1, defined in 6TiSCH minimal, is well-known (offers no security) and used for EBs only */
#ifdef TSCH_SECURITY_CONF_K1
#define TSCH_SECURITY_K1 TSCH_SECURITY_CONF_K1