Added target EUI-64 to authentication result callback

Author: Mika Leppänen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -92,7 +92,7 @@ static void ws_bootstrap_nw_key_clear(protocol_interface_info_entry_t *cur, uint
 static void ws_bootstrap_nw_key_index_set(protocol_interface_info_entry_t *cur, uint8_t index);
 static void ws_bootstrap_nw_frame_counter_set(protocol_interface_info_entry_t *cur, uint32_t counter);
 static void ws_bootstrap_nw_frame_counter_read(protocol_interface_info_entry_t *cur, uint32_t *counter);
-static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_t *cur, auth_result_e result);
+static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_t *cur, auth_result_e result, uint8_t *target_eui_64);
 static void ws_bootstrap_pan_version_increment(protocol_interface_info_entry_t *cur);
 static ws_nud_table_entry_t *ws_nud_entry_discover(protocol_interface_info_entry_t *cur, void *neighbor);
 static void ws_nud_entry_remove(protocol_interface_info_entry_t *cur, mac_neighbor_table_entry_t *entry_ptr);
@@ -2196,8 +2196,10 @@ static void ws_bootstrap_nw_frame_counter_read(protocol_interface_info_entry_t *
     mac_helper_link_frame_counter_read(cur->id, counter);
 }
 
-static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_t *cur, auth_result_e result)
+static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_t *cur, auth_result_e result, uint8_t *target_eui_64)
 {
+    (void) target_eui_64;
+
     if (result == AUTH_RESULT_OK) {
         tr_debug("authentication success");
         ws_bootstrap_event_configuration_start(cur);

source/6LoWPAN/ws/ws_pae_controller.c

@@ -165,12 +165,12 @@ int8_t ws_pae_controller_authenticate(protocol_interface_info_entry_t *interface
             ws_pae_controller_nw_key_check_and_insert(controller->interface_ptr, &controller->gtks);
             sec_prot_keys_gtks_updated_reset(&controller->gtks);
         }
-        controller->auth_completed(interface_ptr, true);
+        controller->auth_completed(interface_ptr, true, NULL);
         return 0;
     }
 
     if (ws_pae_supp_authenticate(controller->interface_ptr, controller->target_pan_id, controller->target_eui_64) < 0) {
-        controller->auth_completed(interface_ptr, false);
+        controller->auth_completed(interface_ptr, false, controller->target_eui_64);
     }
 
 #else

source/6LoWPAN/ws/ws_pae_controller.h

@@ -493,9 +493,10 @@ typedef void ws_pae_controller_nw_frame_counter_read(protocol_interface_info_ent
  *
  * \param interface_ptr interface
  * \param result result, either ok or failure reason
+ * \param target_eui_64 EAPOL target in case of failure or NULL
  *
  */
-typedef void ws_pae_controller_auth_completed(protocol_interface_info_entry_t *interface_ptr, auth_result_e result);
+typedef void ws_pae_controller_auth_completed(protocol_interface_info_entry_t *interface_ptr, auth_result_e result, uint8_t *target_eui_64);
 
 /**
  * ws_pae_controller_pan_ver_increment PAN version increment callback

source/6LoWPAN/ws/ws_pae_supp.c

@@ -181,7 +181,7 @@ int8_t ws_pae_supp_authenticate(protocol_interface_info_entry_t *interface_ptr,
     }
 
     if (ws_pae_supp_nw_keys_valid_check(pae_supp, dest_pan_id) >= 0) {
-        pae_supp->auth_completed(interface_ptr, true);
+        pae_supp->auth_completed(interface_ptr, true, NULL);
         return 0;
     }
 
@@ -462,7 +462,11 @@ static void ws_pae_supp_authenticate_response(pae_supp_t *pae_supp, auth_result_
     pae_supp->auth_trickle_running = false;
     if (pae_supp->auth_requested && pae_supp->auth_completed) {
         pae_supp->auth_requested = false;
-        pae_supp->auth_completed(pae_supp->interface_ptr, result);
+        uint8_t *target_eui_64 = NULL;
+        if (result != AUTH_RESULT_OK) {
+            target_eui_64 = pae_supp->target_addr.eui_64;
+        }
+        pae_supp->auth_completed(pae_supp->interface_ptr, result, target_eui_64);
     }
 }
 

source/6LoWPAN/ws/ws_pae_supp.h

@@ -207,9 +207,10 @@ typedef void ws_pae_supp_nw_key_index_set(protocol_interface_info_entry_t *inter
  *
  * \param interface_ptr interface
  * \param result result, either ok or failure reason
+ * \param target_eui_64 EAPOL target in case of failure or NULL
  *
  */
-typedef void ws_pae_supp_auth_completed(protocol_interface_info_entry_t *interface_ptr, auth_result_e result);
+typedef void ws_pae_supp_auth_completed(protocol_interface_info_entry_t *interface_ptr, auth_result_e result, uint8_t *target_eui_64);
 
 /**
  * ws_pae_supp_nw_key_insert network key insert callback

source/Security/kmp/kmp_eapol_pdu_if.c

@@ -177,7 +177,7 @@ static int8_t kmp_eapol_pdu_if_tx_status(protocol_interface_info_entry_t *interf
     }
 
     kmp_tx_status_e kmp_tx_status;
-    if (tx_status == EAPOL_PDU_TX_OK ) {
+    if (tx_status == EAPOL_PDU_TX_OK) {
         kmp_tx_status = KMP_TX_OK;
     } else if (tx_status == EAPOL_PDU_TX_ERR_TX_NO_ACK) {
         kmp_tx_status = KMP_TX_ERR_TX_NO_ACK;

source/Security/protocols/key_sec_prot/key_sec_prot.c

@@ -319,8 +319,8 @@ static int8_t key_sec_prot_tx_status_ind(sec_prot_t *prot, sec_prot_tx_status_e
     // Indicates TX failure
     if (tx_status == SEC_PROT_TX_ERR_TX_NO_ACK) {
         sec_prot_result_set(&data->common, KMP_RESULT_ERR_TX_NO_ACK);
-    // Indicates other failure
     } else if (tx_status != SEC_PROT_TX_OK) {
+        // Indicates other failure
         sec_prot_result_set(&data->common, KMP_RESULT_ERR_UNSPEC);
     }
     prot->state_machine_call(prot);