Skip to content

Commit a987e76

Browse files
committed
Use uml for hostap tests
Remove tests that fail with openssl
1 parent 6b47ebd commit a987e76

6 files changed

Lines changed: 370 additions & 71 deletions

File tree

.github/workflows/hostap-files/configs/b607d2723e927a3446d89aed813f1aa6068186bb/tests

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,7 @@ ap_wpa2_psk_supp_proto_no_gtk_in_group_msg
191191
ap_wpa2_psk_supp_proto_too_long_gtk_in_group_msg
192192
ap_wpa2_psk_supp_proto_too_long_gtk_kde
193193
ap_wpa2_psk_supp_proto_gtk_not_encrypted
194-
ap_wpa2_psk_supp_proto_no_igtk
195-
ap_wpa2_psk_supp_proto_igtk_ok
196-
ap_wpa2_psk_supp_proto_igtk_keyid_swap
197-
ap_wpa2_psk_supp_proto_igtk_keyid_too_large
198-
ap_wpa2_psk_supp_proto_igtk_keyid_unexpected
199194
ap_wpa2_psk_wep
200-
ap_wpa2_psk_ifdown
201195
ap_wpa2_psk_drop_first_msg_4
202196
ap_wpa2_psk_disable_enable
203197
ap_wpa2_psk_incorrect_passphrase
@@ -210,10 +204,7 @@ ap_wpa2_disable_eapol_retry
210204
ap_wpa2_disable_eapol_retry_group
211205
ap_wpa2_psk_mic_0
212206
ap_wpa2_psk_local_error
213-
ap_wpa2_psk_inject_assoc
214-
ap_wpa2_psk_no_control_port
215207
ap_wpa2_psk_ap_control_port
216-
ap_wpa2_psk_ap_control_port_disabled
217208
ap_wpa2_psk_rsne_mismatch_ap
218209
ap_wpa2_psk_rsne_mismatch_ap2
219210
ap_wpa2_psk_rsne_mismatch_ap3
@@ -253,10 +244,8 @@ ap_wpa2_eap_aka_sql
253244
ap_wpa2_eap_aka_config
254245
ap_wpa2_eap_aka_ext
255246
ap_wpa2_eap_aka_ext_auth_fail
256-
ap_wpa2_eap_aka_prime
257247
ap_wpa2_eap_aka_prime_imsi_identity
258248
ap_wpa2_eap_aka_prime_imsi_privacy_key
259-
ap_wpa2_eap_aka_prime_sql
260249
ap_wpa2_eap_aka_prime_ext_auth_fail
261250
ap_wpa2_eap_aka_prime_ext
262251
ap_wpa2_eap_ttls_pap
@@ -416,19 +405,6 @@ ap_wpa2_radius_server_get_id
416405
ap_wpa2_eap_tls_tod
417406
ap_wpa2_eap_tls_tod_tofu
418407
ap_wpa2_eap_sake_no_control_port
419-
ap_wpa2_tdls
420-
ap_wpa2_tdls_concurrent_init
421-
ap_wpa2_tdls_concurrent_init2
422-
ap_wpa2_tdls_decline_resp
423-
ap_wpa2_tdls_long_lifetime
424-
ap_wpa2_tdls_long_frame
425-
ap_wpa2_tdls_reneg
426-
ap_wpa2_tdls_wrong_lifetime_resp
427-
ap_wpa2_tdls_diff_rsnie
428-
ap_wpa2_tdls_wrong_tpk_m2_mic
429-
ap_wpa2_tdls_wrong_tpk_m3_mic
430-
ap_wpa2_tdls_double_tpk_m2
431-
ap_wpa2_tdls_responder_teardown
432408
dpp_network_intro_version
433409
dpp_network_intro_version_change
434410
dpp_network_intro_version_missing_req
@@ -459,12 +435,9 @@ dpp_qr_code_curves
459435
dpp_qr_code_curves_brainpool
460436
dpp_qr_code_unsupported_curve
461437
dpp_qr_code_keygen_fail
462-
dpp_qr_code_curve_select
463438
dpp_qr_code_auth_broadcast
464-
dpp_configurator_enrollee
465439
dpp_configurator_enrollee_prime256v1
466440
dpp_configurator_enrollee_secp384r1
467-
dpp_configurator_enrollee_secp521r1
468441
dpp_configurator_enrollee_brainpoolP256r1
469442
dpp_configurator_enrollee_brainpoolP384r1
470443
dpp_configurator_enrollee_brainpoolP512r1
@@ -477,7 +450,6 @@ dpp_qr_code_curve_brainpoolP384r1
477450
dpp_qr_code_curve_brainpoolP512r1
478451
dpp_qr_code_set_key
479452
dpp_qr_code_auth_mutual
480-
dpp_qr_code_auth_mutual2
481453
dpp_qr_code_auth_mutual_p_256
482454
dpp_qr_code_auth_mutual_p_384
483455
dpp_qr_code_auth_mutual_p_521
@@ -514,13 +486,11 @@ dpp_config_no_signed_connector
514486
dpp_config_unexpected_signed_connector_char
515487
dpp_config_root_not_an_object
516488
dpp_config_no_wi_fi_tech
517-
dpp_config_unsupported_wi_fi_tech
518489
dpp_config_no_discovery
519490
dpp_config_no_discovery_ssid
520491
dpp_config_too_long_discovery_ssid
521492
dpp_config_no_cred
522493
dpp_config_no_cred_akm
523-
dpp_config_unsupported_cred_akm
524494
dpp_config_error_legacy_no_pass
525495
dpp_config_error_legacy_too_long_pass
526496
dpp_config_error_legacy_psk_with_sae
@@ -531,13 +501,10 @@ dpp_config_connector_error_ext_sign
531501
dpp_config_connector_error_too_short_timestamp
532502
dpp_config_connector_error_invalid_timestamp
533503
dpp_config_connector_error_invalid_timestamp_date
534-
dpp_config_connector_error_invalid_time_zone
535-
dpp_config_connector_error_invalid_time_zone_2
536504
dpp_config_connector_error_expired_1
537505
dpp_config_connector_error_expired_2
538506
dpp_config_connector_error_expired_3
539507
dpp_config_connector_error_expired_4
540-
dpp_config_connector_error_expired_5
541508
dpp_config_connector_error_expired_6
542509
dpp_config_connector_error_no_groups
543510
dpp_config_connector_error_empty_groups
@@ -565,13 +532,6 @@ dpp_ap_config_p256_bp256
565532
dpp_ap_config_bp256_p256
566533
dpp_ap_config_p521_bp512
567534
dpp_ap_config_reconfig_configurator
568-
dpp_auto_connect_1
569-
dpp_auto_connect_2
570-
dpp_auto_connect_2_connect_cmd
571-
dpp_auto_connect_2_sta_ver1
572-
dpp_auto_connect_2_ap_ver1
573-
dpp_auto_connect_2_ver1
574-
dpp_auto_connect_2_conf_ver1
575535
dpp_auto_connect_legacy
576536
dpp_auto_connect_legacy_ssid_charset
577537
dpp_auto_connect_legacy_sae_1
@@ -580,13 +540,6 @@ dpp_auto_connect_legacy_psk_sae_1
580540
dpp_auto_connect_legacy_psk_sae_2
581541
dpp_auto_connect_legacy_psk_sae_3
582542
dpp_auto_connect_legacy_pmf_required
583-
dpp_qr_code_auth_responder_configurator
584-
dpp_qr_code_auth_responder_configurator_group_id
585-
dpp_qr_code_auth_enrollee_init_netrole
586-
dpp_qr_code_hostapd_init
587-
dpp_qr_code_hostapd_init_offchannel
588-
dpp_qr_code_hostapd_init_offchannel_neg_freq
589-
dpp_qr_code_hostapd_ignore_mismatch
590543
dpp_test_vector_p_256
591544
dpp_test_vector_p_256_b
592545
dpp_test_vector_p_521
@@ -603,7 +556,6 @@ dpp_pkex_no_identifier
603556
dpp_pkex_identifier_mismatch
604557
dpp_pkex_identifier_mismatch2
605558
dpp_pkex_identifier_mismatch3
606-
dpp_pkex_5ghz
607559
dpp_pkex_test_vector
608560
dpp_pkex_code_mismatch
609561
dpp_pkex_code_mismatch_limit
@@ -625,7 +577,6 @@ dpp_pkex_hostapd_errors
625577
dpp_pkex_nak_curve_change
626578
dpp_pkex_nak_curve_change2
627579
dpp_hostapd_configurator
628-
dpp_hostapd_configurator_enrollee_v1
629580
dpp_hostapd_configurator_responder
630581
dpp_hostapd_configurator_fragmentation
631582
dpp_hostapd_enrollee_fragmentation
@@ -650,7 +601,6 @@ dpp_proto_stop_at_pkex_cr_req
650601
dpp_proto_stop_at_pkex_cr_resp
651602
dpp_proto_network_introduction
652603
dpp_hostapd_auth_conf_timeout
653-
dpp_hostapd_auth_resp_retries
654604
dpp_tcp
655605
dpp_tcp_port
656606
dpp_tcp_mutual
@@ -702,6 +652,5 @@ dpp_qr_code_config_event_initiator_failure
702652
dpp_qr_code_config_event_initiator_no_response
703653
dpp_qr_code_config_event_initiator_both
704654
dpp_tcp_qr_code_config_event_initiator
705-
dpp_qr_code_config_event_responder
706655
dpp_discard_public_action
707656

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From a53a6a67dc121b45d611318e2a37815cc209839c Mon Sep 17 00:00:00 2001
2+
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
3+
Date: Fri, 19 Apr 2024 16:41:38 +0200
4+
Subject: [PATCH] Fixes for running tests under UML
5+
6+
- Apply commit ID fix from more recent commit
7+
- priv_sz and pub_sz are checked and fail on UML. Probably because stack is zeroed out.
8+
---
9+
src/crypto/crypto_wolfssl.c | 2 +-
10+
tests/hwsim/run-all.sh | 8 +++++++-
11+
2 files changed, 8 insertions(+), 2 deletions(-)
12+
13+
diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c
14+
index 00ecf61352..a57fa50697 100644
15+
--- a/src/crypto/crypto_wolfssl.c
16+
+++ b/src/crypto/crypto_wolfssl.c
17+
@@ -785,7 +785,7 @@ int crypto_dh_init(u8 generator, const u8 *prime, size_t prime_len, u8 *privkey,
18+
int ret = -1;
19+
WC_RNG rng;
20+
DhKey *dh = NULL;
21+
- word32 priv_sz, pub_sz;
22+
+ word32 priv_sz = prime_len, pub_sz = prime_len;
23+
24+
if (TEST_FAIL())
25+
return -1;
26+
diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
27+
index ee48cd0581..75c3a58b52 100755
28+
--- a/tests/hwsim/run-all.sh
29+
+++ b/tests/hwsim/run-all.sh
30+
@@ -15,7 +15,13 @@ export LOGDIR
31+
if [ -z "$DBFILE" ]; then
32+
DB=""
33+
else
34+
- DB="-S $DBFILE --commit $(git rev-parse HEAD)"
35+
+ DB="-S $DBFILE"
36+
+ if [ -z "$COMMITID" ]; then
37+
+ COMMITID="$(git rev-parse HEAD)"
38+
+ fi
39+
+ if [ -n "$COMMITID" ]; then
40+
+ DB="$DB --commit $COMMITID"
41+
+ fi
42+
if [ -n "$BUILD" ]; then
43+
DB="$DB -b $BUILD"
44+
fi
45+
--
46+
2.34.1
47+

.github/workflows/hostap-files/configs/hostap_2_10/tests

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ ap_wpa2_disable_eapol_retry_group
163163
ap_wpa2_psk_mic_0
164164
ap_wpa2_psk_local_error
165165
ap_wpa2_psk_inject_assoc
166-
ap_wpa2_psk_no_control_port
167166
ap_wpa2_psk_ap_control_port
168167
ap_wpa2_psk_ap_control_port_disabled
169168
ap_wpa2_psk_rsne_mismatch_ap
@@ -269,16 +268,3 @@ ap_wpa2_eap_psk_mac_addr_change
269268
ap_wpa2_eap_server_get_id
270269
ap_wpa2_radius_server_get_id
271270
ap_wpa2_eap_sake_no_control_port
272-
ap_wpa2_tdls
273-
ap_wpa2_tdls_concurrent_init
274-
ap_wpa2_tdls_concurrent_init2
275-
ap_wpa2_tdls_decline_resp
276-
ap_wpa2_tdls_long_lifetime
277-
ap_wpa2_tdls_long_frame
278-
ap_wpa2_tdls_reneg
279-
ap_wpa2_tdls_wrong_lifetime_resp
280-
ap_wpa2_tdls_diff_rsnie
281-
ap_wpa2_tdls_wrong_tpk_m2_mic
282-
ap_wpa2_tdls_wrong_tpk_m3_mic
283-
ap_wpa2_tdls_double_tpk_m2
284-
ap_wpa2_tdls_responder_teardown

0 commit comments

Comments
 (0)