Integrate EAPOL new encode and decode functionality

Author: Juha Heiskanen

source/Security/eapol/eapol.c

@@ -24,8 +24,10 @@
 #include "fhss_config.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/ws/ws_config.h"
-#include "Security/eapol/eapol.h"
+#include "Security/PANA/pana_eap_header.h"
+#include "Security/eapol/eapol_helper.h"
 #include "Security/kmp/sec_prot.h"
+#include "common_functions.h"
 
 #ifdef HAVE_WS
 
@@ -81,17 +83,34 @@ static void key_sec_prot_delete(sec_prot_t *prot)
 static void key_sec_prot_create_request(sec_prot_t *prot, sec_prot_keys_t *sec_keys)
 {
     key_sec_prot_int_t *data = key_sec_prot_get(prot);
+    (void) sec_keys;
 
-    eapol_decoded_t *eapol_decoded_data = 0; // In future fill with data that defines eapol message
-    uint16_t eapol_pdu_size;
-    eapol_pdu_t *eapol_pdu = ws_eapol_encode(eapol_decoded_data, sec_keys, &eapol_pdu_size);
+    uint8_t kmpid_test[22];
+    kmpid_test[0] = 0xdd;
+    kmpid_test[1] = 20;
+    common_write_24_bit(0x0C5A9E, &kmpid_test[2]);
+    kmpid_test[5] = 1;
 
-    if (!eapol_pdu) {
-        data->result = SEC_RESULT_ERR_NO_MEM;
-    }
+    eapol_pdu_t eapol_pdu;
+
+    uint16_t eapol_pdu_size =  eapol_pdu_key_frame_init(&eapol_pdu, 22, kmpid_test);
+
+    uint8_t *eapol_decoded_data = ns_dyn_mem_temporary_alloc(eapol_pdu_size); // In future fill with data that defines eapol message
 
-    if (prot->send(prot, eapol_pdu, eapol_pdu_size) < 0) {
+
+    if (!eapol_decoded_data) {
         data->result = SEC_RESULT_ERR_NO_MEM;
+    } else {
+        //Test Data
+        eapol_pdu.msg.key.key_information.install = true;
+        eapol_pdu.msg.key.key_information.pairwise_key = true;
+        eapol_pdu.msg.key.replay_counter = 10;
+        eapol_pdu.msg.key.key_length = 32;
+        eapol_write_pdu_frame(eapol_decoded_data, &eapol_pdu);
+
+        if (prot->send(prot, eapol_decoded_data, eapol_pdu_size) < 0) {
+            data->result = SEC_RESULT_ERR_NO_MEM;
+        }
     }
 
     data->state = KEY_CREATE_REQ;
@@ -108,17 +127,15 @@ static void key_sec_prot_create_response(sec_prot_t *prot, sec_prot_result_e res
 
 static int8_t key_sec_prot_receive(sec_prot_t *prot, void *pdu, uint16_t size)
 {
-    eapol_decoded_t *eapol_decoded_data = ws_eapol_decode(pdu, prot->sec_keys,
-        size);
-
-    ns_dyn_mem_free(pdu);
-
+    eapol_pdu_t eapol_pdu;
     // Decoding is successful
-    if (eapol_decoded_data) {
+    if (eapol_parse_pdu_header(pdu, size, &eapol_pdu)) {
+        ns_dyn_mem_free(pdu);
         prot->create_ind(prot);
         return 0;
     } else {
         // No error handling yet, indicate just that ready to be deleted
+        ns_dyn_mem_free(pdu);
         prot->finished(prot);
         return -1;
     }

source/Security/eapol/eapol.h

@@ -93,7 +93,7 @@ SRCS += \
 	source/RPL/rpl_mrhof.c \
 	source/RPL/rpl_policy.c \
 	source/Security/Common/security_lib.c \
-	source/Security/eapol/eapol.c \
+	source/Security/eapol/eapol_helper.c \
 	source/Security/kmp/key_sec_prot.c \
 	source/Security/kmp/kmp_api.c \
 	source/Security/kmp/kmp_addr.c \