Added GKH MIC validation and encryption

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_auth.c

@@ -35,7 +35,7 @@
 #include "Security/protocols/key_sec_prot/key_sec_prot.h"
 #include "Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot.h"
 #include "Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h"
-#include "Security/protocols/gkh_sec_prot/gkh_sec_prot.h"
+#include "Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "6LoWPAN/ws/ws_pae_auth.h"
 #include "6LoWPAN/ws/ws_pae_lib.h"
@@ -138,7 +138,7 @@ int8_t ws_pae_auth_init(protocol_interface_info_entry_t *interface_ptr, uint16_t
         goto error;
     }
 
-    if (gkh_auth_sec_prot_register(pae_auth->kmp_service) < 0) {
+    if (auth_gkh_sec_prot_register(pae_auth->kmp_service) < 0) {
         goto error;
     }
 

source/6LoWPAN/ws/ws_pae_supp.c

@@ -37,7 +37,7 @@
 #include "Security/protocols/key_sec_prot/key_sec_prot.h"
 #include "Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot.h"
 #include "Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h"
-#include "Security/protocols/gkh_sec_prot/gkh_sec_prot.h"
+#include "Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "6LoWPAN/ws/ws_pae_supp.h"
 #include "6LoWPAN/ws/ws_pae_lib.h"
@@ -255,7 +255,7 @@ int8_t ws_pae_supp_init(protocol_interface_info_entry_t *interface_ptr)
         goto error;
     }
 
-    if (gkh_supp_sec_prot_register(pae_supp->kmp_service) < 0) {
+    if (supp_gkh_sec_prot_register(pae_supp->kmp_service) < 0) {
         goto error;
     }
 

source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c

@@ -43,7 +43,7 @@
 typedef enum {
     FWH_STATE_INIT = SEC_STATE_INIT,
     FWH_STATE_CREATE_REQ = SEC_STATE_CREATE_REQ,
-    FWH_STATE_MESSAGE_2,
+    FWH_STATE_MESSAGE_2 = SEC_STATE_FIRST,
     FWH_STATE_MESSAGE_4,
     FWH_STATE_FINISH = SEC_STATE_FINISH,
     FWH_STATE_FINISHED = SEC_STATE_FINISHED
@@ -57,11 +57,6 @@ typedef enum {
     FWH_MESSAGE_4
 } fwh_sec_prot_msg_e;
 
-#define KEY_INFO_INSTALL              0x01
-#define KEY_INFO_KEY_ACK              0x02
-#define KEY_INFO_KEY_MIC              0x04
-#define KEY_INFO_SECURED_KEY_FRAME    0x08
-
 typedef struct {
     sec_prot_common_t             common;                      /**< Common data */
     eapol_pdu_t                   recv_eapol_pdu;              /**< Received EAPOL PDU */
@@ -178,26 +173,14 @@ static int8_t auth_fwh_sec_prot_receive(sec_prot_t *prot, void *pdu, uint16_t si
 
 static fwh_sec_prot_msg_e auth_fwh_sec_prot_message_get(eapol_pdu_t *eapol_pdu, sec_prot_keys_t *sec_keys)
 {
-    uint8_t key_mask = 0;
     fwh_sec_prot_msg_e msg = FWH_MESSAGE_UNKNOWN;
 
     if (!eapol_pdu->msg.key.key_information.pairwise_key) {
         // This is mismatch between KMP ID indicating 802.11/4WH and key type
         return FWH_MESSAGE_UNKNOWN;
     }
 
-    if (eapol_pdu->msg.key.key_information.install) {
-        key_mask |= KEY_INFO_INSTALL;
-    }
-    if (eapol_pdu->msg.key.key_information.key_ack) {
-        key_mask |= KEY_INFO_KEY_ACK;
-    }
-    if (eapol_pdu->msg.key.key_information.key_mic) {
-        key_mask |= KEY_INFO_KEY_MIC;
-    }
-    if (eapol_pdu->msg.key.key_information.secured_key_frame) {
-        key_mask |= KEY_INFO_SECURED_KEY_FRAME;
-    }
+    uint8_t key_mask = sec_prot_lib_key_mask_get(eapol_pdu);
 
     switch (key_mask) {
         case KEY_INFO_KEY_MIC:
@@ -387,6 +370,7 @@ static void auth_fwh_sec_prot_state_machine(sec_prot_t *prot)
                 if (auth_fwh_sec_prot_mic_validate(prot) < 0) {
                     return;
                 }
+                memcpy(prot->sec_keys->ptk, data->new_ptk, PTK_LEN);
                 sec_prot_state_set(prot, &data->common, FWH_STATE_FINISH);
             }
             break;

source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c

@@ -190,26 +190,14 @@ static int8_t supp_fwh_sec_prot_receive(sec_prot_t *prot, void *pdu, uint16_t si
 
 static fwh_sec_prot_msg_e supp_fwh_sec_prot_message_get(eapol_pdu_t *eapol_pdu, sec_prot_keys_t *sec_keys)
 {
-    uint8_t key_mask = 0;
     fwh_sec_prot_msg_e msg = FWH_MESSAGE_UNKNOWN;
 
     if (!eapol_pdu->msg.key.key_information.pairwise_key) {
         // This is mismatch between KMP ID indicating 802.11/4WH and key type
         return FWH_MESSAGE_UNKNOWN;
     }
 
-    if (eapol_pdu->msg.key.key_information.install) {
-        key_mask |= KEY_INFO_INSTALL;
-    }
-    if (eapol_pdu->msg.key.key_information.key_ack) {
-        key_mask |= KEY_INFO_KEY_ACK;
-    }
-    if (eapol_pdu->msg.key.key_information.key_mic) {
-        key_mask |= KEY_INFO_KEY_MIC;
-    }
-    if (eapol_pdu->msg.key.key_information.secured_key_frame) {
-        key_mask |= KEY_INFO_SECURED_KEY_FRAME;
-    }
+    uint8_t key_mask = sec_prot_lib_key_mask_get(eapol_pdu);
 
     switch (key_mask) {
         case KEY_INFO_KEY_ACK: