Corrected skipping of other elements than KDEs on EAPOL key frames

Unknown elements are now correctly skipped on key data field.

Author: Mika Leppänen

source/Security/eapol/kde_helper.c

@@ -108,8 +108,8 @@ static const uint8_t *kde_search(const uint8_t *ptr, uint16_t len, const uint8_t
     while (len >= KDE_MIN_LEN) {
         uint16_t kde_len = ptr[1] + KDE_FIXED_LEN;
 
-        // Type shall be 0xdd and length shall be at least 6 */
-        if (ptr[KDE_TYPE_INDEX] != 0xdd || kde_len < KDE_MIN_LEN || kde_len > len) {
+        // For the type 0xdd the length shall be at least 6 */
+        if ((ptr[KDE_TYPE_INDEX] == 0xdd && kde_len < KDE_MIN_LEN) || kde_len > len) {
             return NULL;
         }
 

test/nanostack/unittest/security/kde_helper/Makefile

@@ -0,0 +1,17 @@
+include ../../makefile_defines.txt
+
+COMPONENT_NAME = kde_helper_unit
+
+#This must be changed manually
+SRC_FILES = \
+        ../../../../../source/Security/eapol/kde_helper.c
+
+TEST_SRC_FILES = \
+	main.cpp \
+        kde_helpertest.cpp \
+        test_kde_helper.c \
+        ../../stub/common_functions_stub.c \
+
+include ../../MakefileWorker.mk
+
+CPPUTESTFLAGS += -DFEA_TRACE_SUPPORT

test/nanostack/unittest/security/kde_helper/kde_helpertest.cpp

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "CppUTest/TestHarness.h"
+
+#include "test_kde_helper.h"
+
+TEST_GROUP(kde_helper)
+{
+    void setup() {
+    }
+
+    void teardown() {
+    }
+};
+
+TEST(kde_helper, test_kde_gtkl_read)
+{
+    CHECK(test_kde_gtkl_read());
+}
+
+TEST(kde_helper, test_kde_gtk_read)
+{
+    CHECK(test_kde_gtk_read());
+}
+
+TEST(kde_helper, test_kde_pmkid_read)
+{
+    CHECK(test_kde_pmkid_read());
+}
+
+TEST(kde_helper, test_kde_ptkid_read)
+{
+    CHECK(test_kde_ptkid_read());
+}
+
+TEST(kde_helper, test_kde_lifetime_read)
+{
+    CHECK(test_kde_lifetime_read());
+}
+
+TEST(kde_helper, test_kde_gtkl_write)
+{
+    CHECK(test_kde_gtkl_write());
+}
+
+TEST(kde_helper, test_kde_gtk_write)
+{
+    CHECK(test_kde_gtk_write());
+}
+
+TEST(kde_helper, test_kde_pmkid_write)
+{
+    CHECK(test_kde_pmkid_write());
+}
+
+TEST(kde_helper, test_kde_ptkid_write)
+{
+    CHECK(test_kde_ptkid_write());
+}
+
+TEST(kde_helper, test_kde_lifetime_write)
+{
+    CHECK(test_kde_lifetime_write());
+}
+
+TEST(kde_helper, test_kde_padded_length_calc)
+{
+    CHECK(test_kde_padded_length_calc());
+}
+
+TEST(kde_helper, test_kde_padding_write)
+{
+    CHECK(test_kde_padding_write());
+}

test/nanostack/unittest/security/kde_helper/main.cpp

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "CppUTest/CommandLineTestRunner.h"
+#include "CppUTest/TestPlugin.h"
+#include "CppUTest/TestRegistry.h"
+#include "CppUTestExt/MockSupportPlugin.h"
+int main(int ac, char **av)
+{
+    return CommandLineTestRunner::RunAllTests(ac, av);
+}
+
+IMPORT_TEST_GROUP(kde_helper);
+