FW-867. Move IEEE802154E security option to config.h

lanyangyang · May 29, 2020 · c02bfe4 · c02bfe4
1 parent 7ed3719
commit c02bfe4
Show file tree

Hide file tree

Showing 26 changed files with 306 additions and 197 deletions.
diff --git a/SConscript b/SConscript
@@ -90,8 +90,6 @@ if env['atmel_24ghz'] == 1:
     env.Append(CPPDEFINES='ATMEL_24GHZ')
 if env['noadaptivesync'] == 1:
     env.Append(CPPDEFINES='NOADAPTIVESYNC')
-if env['l2_security'] == 1:
-    env.Append(CPPDEFINES='L2_SECURITY_ACTIVE')
 if 11 <= env['fix_channel'] <= 26:
     env.Append(CPPDEFINES={'IEEE802154E_SINGLE_CHANNEL': env['fix_channel']})
 if env['deadline_option'] == 1:

diff --git a/SConstruct b/SConstruct
@@ -81,8 +81,6 @@ project:
     forcetopology  Force the topology to the one indicated in the
                    openstack/02a-MAClow/topology.c file.
     noadaptivesync Do not use adaptive synchronization.
-    l2_security   Use hop-by-hop encryption and authentication.
-                  0 (off), 1 (on)
     ide           qtcreator
     fix_channel   Set single channel hopping for debugging
                   0 (off, default), i (on, channel=i [11:26])
@@ -150,7 +148,6 @@ command_line_options = {
     'debug': ['0', '1'],
     'atmel_24ghz': ['0', '1'],
     'noadaptivesync': ['0', '1'],
-    'l2_security': ['0', '1'],
     'fix_channel': ['0'] + map(str, range(11, 27)),
     'deadline_option': ['0', '1'],
     'ide': ['none', 'qtcreator'],
@@ -288,13 +285,6 @@ command_line_vars.AddVariables(
         validate_option,  # validator
         int,  # converter
     ),
-    (
-        'l2_security',  # key
-        '',  # help
-        command_line_options['l2_security'][0],  # default
-        validate_option,  # validator
-        int,  # converter
-    ),
     (
         'fix_channel',  # key
         '',  # help

diff --git a/bsp/boards/iot-lab_A8-M3/board.c b/bsp/boards/iot-lab_A8-M3/board.c
@@ -4,6 +4,8 @@
 \author Alaeddine Weslati <alaeddine.weslati@inria.fr>, January 2014.
 \author Tengfei Chang <tengfei.chang@inria.fr>,  May 2017.
 */
+
+#include "config.h"
 #include "stm32f10x_lib.h"
 #include "board.h"
 // bsp modules
@@ -96,6 +98,10 @@ void board_init(void){
     debugpins_init();
     //enable nvic for the radio
     NVIC_radio();
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+    cryptoengine_init();
+#enabled
 }
 
 void board_sleep(void) {

diff --git a/bsp/boards/iot-lab_A8-M3/cryptoengine.c b/bsp/boards/iot-lab_A8-M3/cryptoengine.c
@@ -2,6 +2,10 @@
 \brief Implementation of cryptoengine based on AT86RF231's hardware accelerator.
 */
 
+#include "config.h"
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+
 #include <stdint.h>
 #include <string.h>
 #include "at86rf231.h"
@@ -518,4 +522,4 @@ static void inc_counter(uint8_t* counter) {
    } while (n);
 }
 
-
+#endif /* BOARD_CRYPTOENGINE_ENABLED */
diff --git a/bsp/boards/iot-lab_M3/board.c b/bsp/boards/iot-lab_M3/board.c
@@ -4,6 +4,8 @@
 \author Alaeddine Weslati <alaeddine.weslati@inria.fr>, January 2014.
 \author Tengfei Chang <tengfei.chang@inria.fr>,         May 2017.
 */
+
+#include "config.h"
 #include "stm32f10x_conf.h"
 #include "board.h"
 // bsp modules
@@ -92,7 +94,10 @@ void board_init(void)
     debugpins_init();
     //enable nvic for the radio
     NVIC_radio();
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
     cryptoengine_init();
+#endif
 }
 
 void board_sleep(void) {

diff --git a/bsp/boards/iot-lab_M3/cryptoengine.c b/bsp/boards/iot-lab_M3/cryptoengine.c
@@ -2,6 +2,10 @@
 \brief Implementation of cryptoengine based on AT86RF231's hardware accelerator.
 */
 
+#include "config.h"
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+
 #include <stdint.h>
 #include <string.h>
 #include "at86rf231.h"
@@ -518,4 +522,4 @@ static void inc_counter(uint8_t* counter) {
    } while (n);
 }
 
-
+#endif /* BOARD_CRYPTOENGINE_ENABLED */
diff --git a/bsp/boards/openmote-b-24ghz/board.c b/bsp/boards/openmote-b-24ghz/board.c
@@ -75,7 +75,10 @@ void board_init(void) {
     i2c_init();
 
     // sensors_init();
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
     cryptoengine_init();
+#endif
 }
 
 void antenna_init(void) {

diff --git a/bsp/boards/openmote-b-24ghz/board_info.h b/bsp/boards/openmote-b-24ghz/board_info.h
@@ -15,6 +15,8 @@
 #include <source/cpu.h>
 #include <source/interrupt.h>
 
+#include "config.h"
+
 //=========================== defines =========================================
 
 //===== interrupt state
@@ -71,11 +73,11 @@
     #define PORT_maxRxDataPrepare                4    //  122us (measured  22us)
     #define PORT_maxTxAckPrepare                10    //  122us (measured  94us)
     // radio speed related
-    #ifdef L2_SECURITY_ACTIVE
+#ifdef OPENWSN_IEEE802154E_SECURITY_C
     #define PORT_delayTx                        14    //  366us (measured xxxus)
-    #else
+#else
     #define PORT_delayTx                        12    //  366us (measured xxxus)
-    #endif
+#endif
     #define PORT_delayRx                         0    //    0us (can not measure)
     // radio watchdog
 #endif

diff --git a/bsp/boards/openmote-b-24ghz/cryptoengine.c b/bsp/boards/openmote-b-24ghz/cryptoengine.c
@@ -3,6 +3,11 @@
   
 \author Malisa Vucinic <malishav@gmail.com>, March 2015.
 */
+
+#include "config.h"
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+
 #include <stdint.h>
 
 #include <headers/hw_sys_ctrl.h>
@@ -157,3 +162,5 @@ static owerror_t load_key(uint8_t key[16], uint8_t* /* out */ key_location) {
    *key_location = DEFAULT_KEY_AREA;
    return E_SUCCESS;
 }
+
+#endif /* BOARD_CRYPTOENGINE_ENABLED */
diff --git a/bsp/boards/openmote-b-subghz/board.c b/bsp/boards/openmote-b-subghz/board.c
@@ -78,7 +78,10 @@ void board_init(void) {
     i2c_init();
 
     // sensors_init();
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
     cryptoengine_init();
+#endif
 }
 
 void antenna_init(void) {

diff --git a/bsp/boards/openmote-b-subghz/board_info.h b/bsp/boards/openmote-b-subghz/board_info.h
@@ -15,6 +15,8 @@
 #include <source/cpu.h>
 #include <source/interrupt.h>
 
+#include "config.h"
+
 //=========================== defines =========================================
 
 //===== interrupt state
@@ -70,11 +72,11 @@
     #define PORT_maxRxDataPrepare                4    //  122us (measured  22us)
     #define PORT_maxTxAckPrepare                10    //  122us (measured  94us)
     // radio speed related
-    #ifdef L2_SECURITY_ACTIVE
+#ifdef OPENWSN_IEEE802154E_SECURITY_C
     #define PORT_delayTx                        14    //  366us (measured xxxus)
-    #else
+#else
     #define PORT_delayTx                        12    //  366us (measured xxxus)
-    #endif
+#endif
     #define PORT_delayRx                         0    //    0us (can not measure)
     // radio watchdog
 #endif

diff --git a/bsp/boards/openmote-b-subghz/cryptoengine.c b/bsp/boards/openmote-b-subghz/cryptoengine.c
@@ -3,6 +3,11 @@
   
 \author Malisa Vucinic <malishav@gmail.com>, March 2015.
 */
+
+#include "config.h"
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+
 #include <stdint.h>
 
 #include <headers/hw_sys_ctrl.h>
@@ -157,3 +162,5 @@ static owerror_t load_key(uint8_t key[16], uint8_t* /* out */ key_location) {
    *key_location = DEFAULT_KEY_AREA;
    return E_SUCCESS;
 }
+
+#endif /* BOARD_CRYPTOENGINE_ENABLED */
diff --git a/bsp/boards/openmote-b/board.c b/bsp/boards/openmote-b/board.c
@@ -84,7 +84,10 @@ void board_init(void) {
    radio_init();
    i2c_init();
    sensors_init();
-   cryptoengine_init();  
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+   cryptoengine_init();
+#endif
 }
 
 void antenna_init(void) {

diff --git a/bsp/boards/openmote-b/board_info.h b/bsp/boards/openmote-b/board_info.h
@@ -15,6 +15,8 @@
 #include <source/cpu.h>
 #include <source/interrupt.h>
 
+#include "config.h"
+
 //=========================== defines =========================================
 
 //===== interrupt state
@@ -70,11 +72,11 @@
     #define PORT_maxRxDataPrepare                4    //  122us (measured  22us)
     #define PORT_maxTxAckPrepare                10    //  122us (measured  94us)
     // radio speed related
-    #ifdef L2_SECURITY_ACTIVE
+#ifdef OPENWSN_IEEE802154E_SECURITY_C
     #define PORT_delayTx                        14    //  366us (measured xxxus)
-    #else
+#else
     #define PORT_delayTx                        12    //  366us (measured xxxus)
-    #endif
+#endif
     #define PORT_delayRx                         0    //    0us (can not measure)
     // radio watchdog
 #endif

diff --git a/bsp/boards/openmote-b/cryptoengine.c b/bsp/boards/openmote-b/cryptoengine.c
@@ -3,6 +3,10 @@
   
 \author Malisa Vucinic <malishav@gmail.com>, March 2015.
 */
+#include "config.h"
+
+#if defined(BOARD_CRYPTOENGINE_ENABLED)
+
 #include <stdint.h>
 
 #include <headers/hw_sys_ctrl.h>
@@ -157,3 +161,5 @@ static owerror_t load_key(uint8_t key[16], uint8_t* /* out */ key_location) {
    *key_location = DEFAULT_KEY_AREA;
    return E_SUCCESS;
 }
+
+#endif /* BOARD_CRYPTOENGINE_ENABLED */