Added configuration flags for supplicant and authenticator PAEs and EAPOL relay

If PAE supplicant flag is not defined, supplicant bootstrap continues
without initiating EAPOL (returns always success)

Author: Mika Leppänen

source/6LoWPAN/ws/ws_eapol_auth_relay.c

@@ -35,7 +35,9 @@
 #include "6LoWPAN/ws/ws_eapol_relay.h"
 #include "6LoWPAN/ws/ws_eapol_auth_relay.h"
 #include "common_functions.h"
+
 #ifdef HAVE_WS
+#ifdef HAVE_PAE_AUTH
 
 #define TRACE_GROUP "wspsu"
 
@@ -44,6 +46,7 @@ static int8_t ws_eapol_auth_relay_eapol_pdu_receive(const uint8_t *eui_64, const
 static int8_t ws_eapol_auth_relay_socket_pdu_receive(const ns_address_t *src_addr, void *data, uint16_t len);
 static int8_t ws_eapol_auth_relay_send_to_kmp(const uint8_t *eui_64, const uint8_t *ip_addr, uint16_t port, const void *data, uint16_t data_len);
 
+
 int8_t ws_eapol_auth_relay_init(protocol_interface_info_entry_t *interface_ptr)
 {
     ws_eapol_relay_init(interface_ptr);
@@ -156,4 +159,5 @@ static int8_t ws_eapol_auth_relay_send_to_kmp(const uint8_t *eui_64, const uint8
     return -1;
 }
 
+#endif /* HAVE_PAE_AUTH */
 #endif /* HAVE_WS */

source/6LoWPAN/ws/ws_eapol_auth_relay.h

@@ -18,7 +18,16 @@
 #ifndef WS_EAPOL_AUTH_RELAY_H_
 #define WS_EAPOL_AUTH_RELAY_H_
 
+#ifdef HAVE_PAE_AUTH
+
 int8_t ws_eapol_auth_relay_init(protocol_interface_info_entry_t *interface_ptr);
 int8_t ws_eapol_auth_relay_start(void);
 
+#else
+
+#define ws_eapol_auth_relay_init(interface_ptr)
+#define ws_eapol_auth_relay_start()
+
+#endif
+
 #endif /* WS_EAPOL_AUTH_RELAY_H_ */

source/6LoWPAN/ws/ws_eapol_supp_relay.c

@@ -35,6 +35,7 @@
 #include "6LoWPAN/ws/ws_eapol_supp_relay.h"
 
 #ifdef HAVE_WS
+#ifdef HAVE_EAPOL_RELAY
 
 #define TRACE_GROUP "wspsu"
 
@@ -97,5 +98,6 @@ static int8_t ws_eapol_supp_relay_socket_pdu_receive(const ns_address_t *src_add
 
 }
 
+#endif /* HAVE_EAPOL_RELAY */
 #endif /* HAVE_WS */
 

source/6LoWPAN/ws/ws_eapol_supp_relay.h

@@ -18,7 +18,16 @@
 #ifndef WS_EAPOL_SUPP_RELAY_H_
 #define WS_EAPOL_SUPP_RELAY_H_
 
+#ifdef HAVE_EAPOL_RELAY
+
 int8_t ws_eapol_supp_relay_init(protocol_interface_info_entry_t *interface_ptr);
 int8_t ws_eapol_supp_relay_start(uint8_t *br_addr);
 
+#else
+
+#define ws_eapol_supp_relay_init(interface_ptr);
+#define ws_eapol_supp_relay_start(br_addr);
+
+#endif
+
 #endif /* WS_EAPOL_SUPP_RELAY_H_ */

source/6LoWPAN/ws/ws_pae_auth.c

@@ -40,6 +40,7 @@
 #include "6LoWPAN/ws/ws_pae_lib.h"
 
 #ifdef HAVE_WS
+#ifdef HAVE_PAE_AUTH
 
 #define TRACE_GROUP "wspsu"
 
@@ -380,5 +381,6 @@ static void ws_pae_auth_kmp_api_finished(kmp_api_t *kmp)
     ws_pae_lib_kmp_list_delete(&supp_entry->kmp_list, kmp);
 }
 
+#endif /* HAVE_PAE_AUTH */
 #endif /* HAVE_WS */
 

source/6LoWPAN/ws/ws_pae_auth.h

@@ -18,6 +18,14 @@
 #ifndef WS_PAE_AUTH_H_
 #define WS_PAE_AUTH_H_
 
+#ifdef HAVE_PAE_AUTH
+
 int8_t ws_pae_auth_init(protocol_interface_info_entry_t *interface_ptr);
 
+#else
+
+#define ws_pae_auth_init(interface_ptr)
+
+#endif
+
 #endif /* WS_PAE_AUTH_H_ */

source/6LoWPAN/ws/ws_pae_controller.c

@@ -50,7 +50,10 @@ void ws_pae_controller_supplicant_authenticate(void)
 
     ws_pae_supp_init(controller_data->interface_ptr);
     ws_pae_supp_cb_register(ws_pae_controller_supp_auth_completed);
-    ws_pae_supp_authenticate(controller_data->target_eui_64);
+    if (ws_pae_supp_authenticate(controller_data->target_eui_64) > 0) {
+        // Already authenticated
+        ws_pae_controller_supp_auth_completed(true);
+    }
 }
 
 void ws_pae_controller_authenticator_start(void)

source/6LoWPAN/ws/ws_pae_supp.c

@@ -45,6 +45,7 @@
 #include "Security/kmp/kmp_eapol_pdu_if.h"
 
 #ifdef HAVE_WS
+#ifdef HAVE_PAE_SUPP
 
 #define TRACE_GROUP "wspsu"
 
@@ -93,7 +94,7 @@ static const trickle_params_t auth_trickle_params = {
     .TimerExpirations = 3  //TRICKLE_EXPIRATIONS_INFINITE
 };
 
-void ws_pae_supp_authenticate(uint8_t *dest_eui_64)
+int8_t ws_pae_supp_authenticate(uint8_t *dest_eui_64)
 {
     // Stores target
     kmp_address_delete(supp_data->entry.addr);
@@ -114,6 +115,8 @@ void ws_pae_supp_authenticate(uint8_t *dest_eui_64)
     supp_data->auth_requested = true;
 
     tr_debug("PAE active");
+
+    return 0;
 }
 
 void ws_pae_supp_authenticate_response(bool success)
@@ -465,5 +468,6 @@ static void ws_pae_supp_kmp_api_finished(kmp_api_t *kmp)
     ws_pae_lib_kmp_list_delete(&supp_data->entry.kmp_list, kmp);
 }
 
+#endif /* HAVE_PAE_SUPP */
 #endif /* HAVE_WS */
 

source/6LoWPAN/ws/ws_pae_supp.h

@@ -20,10 +20,18 @@
 
 typedef void ws_pae_supp_auth_completed(bool success);
 
-void ws_pae_supp_authenticate(uint8_t *dest_eui_64);
+#ifdef HAVE_PAE_SUPP
 
 int8_t ws_pae_supp_init(protocol_interface_info_entry_t *interface_ptr);
-
+int8_t ws_pae_supp_authenticate(uint8_t *dest_eui_64);
 void ws_pae_supp_cb_register(ws_pae_supp_auth_completed *completed_cb);
 
+#else
+
+#define ws_pae_supp_init(interface_ptr)
+#define ws_pae_supp_authenticate(dest_eui_64) 1
+#define ws_pae_supp_cb_register(completed_cb)
+
+#endif
+
 #endif /* WS_PAE_SUPP_H_ */

source/configs/cfg_generic.h

@@ -32,3 +32,6 @@
 #define THREAD_THCI_SUPPORT
 #define HAVE_WS
 #define MLE_TEST
+//#define HAVE_PAE_SUPP
+//#define HAVE_PAE_AUTH
+//#define HAVE_EAPOL_RELAY