Fixes for CI

Author: dgarske

src/supplicant/test_supplicant_sae.c

@@ -118,13 +118,14 @@ static int ap_handle_supp_frame(struct fake_ap *a,
         if (sae_generate_commit(&a->sae) != 0) return -1;
         {
             uint8_t  commit_body[2 + 3 * SAE_MAX_PRIME_LEN];
-            size_t   clen = 0;
+            size_t   commit_len = 0;
             if (sae_serialize_commit(&a->sae, commit_body,
-                                     sizeof(commit_body), &clen) != 0) {
+                                     sizeof(commit_body),
+                                     &commit_len) != 0) {
                 return -1;
             }
             if (ap_send_frame(3, 1, a->h2e ? 126U : 0U,
-                              commit_body, clen) != 0) return -1;
+                              commit_body, commit_len) != 0) return -1;
         }
         a->sent_commit = 1;
 

src/test/unit/unit.c

@@ -336,6 +336,7 @@ Suite *wolf_suite(void)
     tcase_add_test(tc_utils, test_sock_getsockname_invalid_socket_ids);
     tcase_add_test(tc_utils, test_sock_getsockname_icmp_success);
     tcase_add_test(tc_utils, test_register_callback_variants);
+    tcase_add_test(tc_utils, test_register_eapol_handler);
     tcase_add_test(tc_utils, test_sock_connect_udp_bound_ip_not_local);
     tcase_add_test(tc_utils, test_sock_connect_udp_bound_ip_success);
     tcase_add_test(tc_utils, test_sock_connect_udp_primary_fallback);

src/test/unit/unit_tests_dns_dhcp.c

@@ -744,6 +744,35 @@ START_TEST(test_register_callback_variants)
 }
 END_TEST
 
+static int test_eapol_cb(void *ctx, unsigned int if_idx,
+                         const uint8_t *frame, uint32_t len)
+{
+    (void)ctx; (void)if_idx; (void)frame; (void)len;
+    return 0;
+}
+
+START_TEST(test_register_eapol_handler)
+{
+    struct wolfIP s;
+    int           sentinel = 0xA5;
+
+    wolfIP_init(&s);
+
+    /* NULL stack is a no-op (must not crash). */
+    wolfIP_register_eapol_handler(NULL, test_eapol_cb, &sentinel);
+
+    /* Register: handler + ctx stored. */
+    wolfIP_register_eapol_handler(&s, test_eapol_cb, &sentinel);
+    ck_assert_ptr_eq((void *)s.eapol_handler, (void *)test_eapol_cb);
+    ck_assert_ptr_eq(s.eapol_handler_ctx,     &sentinel);
+
+    /* Unregister: passing NULL handler clears it. */
+    wolfIP_register_eapol_handler(&s, NULL, NULL);
+    ck_assert_ptr_eq((void *)s.eapol_handler, NULL);
+    ck_assert_ptr_eq(s.eapol_handler_ctx,     NULL);
+}
+END_TEST
+
 START_TEST(test_sock_connect_udp_bound_ip_not_local)
 {
     struct wolfIP s;