Corrected setting of test GTK on supplicant

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_controller.c

@@ -164,6 +164,7 @@ int8_t ws_pae_controller_authenticate(protocol_interface_info_entry_t *interface
         if (sec_prot_keys_gtks_are_updated(&controller->gtks)) {
             ws_pae_controller_nw_key_check_and_insert(controller->interface_ptr, &controller->gtks);
             sec_prot_keys_gtks_updated_reset(&controller->gtks);
+            ws_pae_supp_gtks_set(controller->interface_ptr, &controller->gtks);
         }
         controller->auth_completed(interface_ptr, AUTH_RESULT_OK, NULL);
         return 0;
@@ -989,6 +990,7 @@ int8_t ws_pae_controller_gtk_update(int8_t interface_id, uint8_t *gtk[4])
             uint32_t lifetime = sec_prot_keys_gtk_install_order_last_lifetime_get(&controller->gtks);
             lifetime += controller->timer_settings.gtk_expire_offset;
             if (sec_prot_keys_gtk_set(&controller->gtks, i, gtk[i], lifetime) >= 0) {
+                controller->gtks_set = true;
                 tr_info("GTK set index: %i, lifetime %"PRIu32", system time: %"PRIu32"", i, lifetime, protocol_core_monotonic_time / 10);
             }
         }

source/6LoWPAN/ws/ws_pae_supp.c

@@ -356,6 +356,18 @@ int8_t ws_pae_supp_nw_key_index_update(protocol_interface_info_entry_t *interfac
     return 0;
 }
 
+int8_t ws_pae_supp_gtks_set(protocol_interface_info_entry_t *interface_ptr, sec_prot_gtk_keys_t *gtks)
+{
+    pae_supp_t *pae_supp = ws_pae_supp_get(interface_ptr);
+    if (!pae_supp) {
+        return -1;
+    }
+
+    pae_supp->gtks = *gtks;
+
+    return 0;
+}
+
 int8_t ws_pae_supp_eapol_target_remove(protocol_interface_info_entry_t *interface_ptr)
 {
     pae_supp_t *pae_supp = ws_pae_supp_get(interface_ptr);

source/6LoWPAN/ws/ws_pae_supp.h

@@ -182,6 +182,18 @@ int8_t ws_pae_supp_gtk_hash_update(protocol_interface_info_entry_t *interface_pt
  */
 int8_t ws_pae_supp_nw_key_index_update(protocol_interface_info_entry_t *interface_ptr, uint8_t index);
 
+/**
+ *  ws_pae_supp_gtks_set set supplicant GTKs
+ *
+ * \param interface_ptr interface
+ * \param gtks GTKs
+ *
+ * \return < 0 failure
+ * \return >= 0 success
+ *
+ */
+int8_t ws_pae_supp_gtks_set(protocol_interface_info_entry_t *interface_ptr, sec_prot_gtk_keys_t *gtks);
+
 /**
  * ws_pae_supp_eapol_target_remove remove EAPOL target set using authentication start
  *
@@ -250,6 +262,7 @@ void ws_pae_supp_cb_register(protocol_interface_info_entry_t *interface_ptr, ws_
 #define ws_pae_supp_border_router_addr_read NULL
 #define ws_pae_supp_gtk_hash_update NULL
 #define ws_pae_supp_nw_key_index_update NULL
+#define ws_pae_supp_gtks_set(interface_ptr, gtks)
 #define ws_pae_supp_eapol_target_remove(interface_ptr)
 
 #endif