Corrected supplicant and controller authentication result causes

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_controller.c

@@ -165,20 +165,20 @@ 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, NULL);
+        controller->auth_completed(interface_ptr, AUTH_RESULT_OK, 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->target_eui_64);
+        controller->auth_completed(interface_ptr, AUTH_RESULT_ERR_UNSPEC, controller->target_eui_64);
     }
 
 #else
     ws_pae_controller_test_keys_set(&controller->gtks);
     ws_pae_controller_nw_key_check_and_insert(interface_ptr, &controller->gtks);
     ws_pae_controller_nw_key_index_check_and_set(interface_ptr, 0);
 
-    controller->auth_completed(interface_ptr, true);
+    controller->auth_completed(interface_ptr, AUTH_RESULT_OK);
 #endif
 
     return 0;

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, NULL);
+        pae_supp->auth_completed(interface_ptr, AUTH_RESULT_OK, NULL);
         return 0;
     }
 
@@ -792,7 +792,7 @@ void ws_pae_supp_fast_timer(uint16_t ticks)
         if (!pae_supp->initial_key_timer && !pae_supp->auth_trickle_running && !running) {
             tr_debug("PAE idle");
             // If not already completed, restart bootstrap
-            ws_pae_supp_authenticate_response(pae_supp, false);
+            ws_pae_supp_authenticate_response(pae_supp, AUTH_RESULT_ERR_UNSPEC);
 
             ws_pae_supp_timer_stop(pae_supp);
         }
@@ -812,7 +812,7 @@ void ws_pae_supp_slow_timer(uint16_t seconds)
             }
             // Maximum number of trickle expires, authentication fails
             if (!trickle_running(&pae_supp->auth_trickle_timer, &pae_supp->auth_trickle_params)) {
-                ws_pae_supp_authenticate_response(pae_supp, false);
+                ws_pae_supp_authenticate_response(pae_supp, AUTH_RESULT_ERR_UNSPEC);
             }
         }
 
@@ -1091,7 +1091,7 @@ static void ws_pae_supp_kmp_api_create_confirm(kmp_api_t *kmp, kmp_result_e resu
 
     // KMP-CREATE.request has failed, authentication error
     if (result != KMP_RESULT_OK) {
-        ws_pae_supp_authenticate_response(pae_supp, false);
+        ws_pae_supp_authenticate_response(pae_supp, AUTH_RESULT_ERR_UNSPEC);
     }
 }
 
@@ -1127,14 +1127,14 @@ static void ws_pae_supp_kmp_api_finished_indication(kmp_api_t *kmp, kmp_result_e
             pae_supp->nw_key_insert(pae_supp->interface_ptr, keys->gtks);
         }
 
-        ws_pae_supp_authenticate_response(pae_supp, result);
+        ws_pae_supp_authenticate_response(pae_supp, AUTH_RESULT_OK);
     }
 
     /* If initial EAPOL-key message sending fails to tx no acknowledge, indicates failure so
        that bootstrap can decide if EAPOL target should be changed */
     else if (type > IEEE_802_1X_INITIAL_KEY && result == KMP_RESULT_ERR_TX_NO_ACK) {
         tr_info("Initial EAPOL-Key TX failure, target: %s", trace_array(kmp_address_eui_64_get(&pae_supp->entry.addr), 8));
-        ws_pae_supp_authenticate_response(pae_supp, result);
+        ws_pae_supp_authenticate_response(pae_supp, AUTH_RESULT_ERR_TX_NO_ACK);
     }
 
 }