Skip to content

Commit 812161c

Browse files
committed
Revert "Re-enable hostap tests and remove some flaky tests"
This reverts commit 4498e12. see #9841 and #10052.
1 parent 54d6555 commit 812161c

4 files changed

Lines changed: 48 additions & 19 deletions

File tree

.github/workflows/hostap-files/configs/07c9f183ea744ac04585fb6dd10220c75a5e2e74/tests

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,9 @@ ap_wpa2_eap_tls_check_cert_subject_neg
248248
ap_wpa2_eap_tls_diff_ca_trust2
249249
ap_wpa2_eap_tls_domain_mismatch_cn
250250
ap_wpa2_eap_tls_domain_suffix_mismatch_cn
251+
ap_wpa2_eap_tls_intermediate_ca_ocsp_multi_missing_resp
252+
ap_wpa2_eap_tls_intermediate_ca_ocsp_revoked_sha1
253+
ap_wpa2_eap_tls_intermediate_ca_ocsp_sha1
251254
ap_wpa2_eap_tls_neg_incorrect_trust_root
252255
ap_wpa2_eap_tls_ocsp_multi
253256
ap_wpa2_eap_tls_ocsp_multi_revoked
@@ -646,6 +649,9 @@ dpp_config_dpp_gen_secp521r1
646649
dpp_config_dpp_gen_secp521r1_prime256v1
647650
dpp_config_dpp_gen_secp521r1_secp384r1
648651
dpp_config_dpp_gen_secp521r1_secp521r1
652+
dpp_config_dpp_override_prime256v1
653+
dpp_config_dpp_override_secp384r1
654+
dpp_config_dpp_override_secp521r1
649655
dpp_config_error_legacy_invalid_psk
650656
dpp_config_error_legacy_no_pass
651657
dpp_config_error_legacy_no_pass_for_sae
@@ -685,6 +691,7 @@ dpp_config_no_discovery
685691
dpp_config_no_discovery_ssid
686692
dpp_config_no_signed_connector
687693
dpp_config_no_wi_fi_tech
694+
dpp_config_override_objects
688695
dpp_config_root_not_an_object
689696
dpp_config_save
690697
dpp_config_save2
@@ -741,6 +748,12 @@ dpp_hostapd_configurator_enrollee_v1
741748
dpp_hostapd_configurator_fragmentation
742749
dpp_hostapd_configurator_override_objects
743750
dpp_hostapd_configurator_responder
751+
dpp_hostapd_enrollee_fragmentation
752+
dpp_hostapd_enrollee_gas_errors
753+
dpp_hostapd_enrollee_gas_proto
754+
dpp_hostapd_enrollee_gas_timeout
755+
dpp_hostapd_enrollee_gas_timeout_comeback
756+
dpp_hostapd_enrollee_gas_tx_status_errors
744757
dpp_intro_mismatch
745758
dpp_invalid_configurator_key
746759
dpp_invalid_legacy_params
@@ -893,6 +906,10 @@ dpp_qr_code_auth_incompatible_roles2
893906
dpp_qr_code_auth_incompatible_roles_failure
894907
dpp_qr_code_auth_incompatible_roles_failure2
895908
dpp_qr_code_auth_incompatible_roles_failure3
909+
dpp_qr_code_auth_initiator_either_1
910+
dpp_qr_code_auth_initiator_either_2
911+
dpp_qr_code_auth_initiator_either_3
912+
dpp_qr_code_auth_initiator_enrollee
896913
dpp_qr_code_auth_mutual
897914
dpp_qr_code_auth_mutual2
898915
dpp_qr_code_auth_mutual_bp_256

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ ap_wpa2_eap_tls_ocsp_server_signed
347347
ap_wpa2_eap_tls_ocsp_invalid_data
348348
ap_wpa2_eap_tls_ocsp_invalid
349349
ap_wpa2_eap_tls_ocsp_unknown_sign
350+
ap_wpa2_eap_tls_intermediate_ca
350351
ap_wpa2_eap_tls_ocsp_multi_revoked
351352
ap_wpa2_eap_tls_domain_suffix_match_cn_full
352353
ap_wpa2_eap_tls_domain_match_cn
@@ -460,6 +461,9 @@ dpp_qr_code_auth_mutual_not_used
460461
dpp_qr_code_auth_mutual_curve_mismatch
461462
dpp_qr_code_auth_hostapd_mutual2
462463
dpp_qr_code_listen_continue
464+
dpp_qr_code_auth_initiator_enrollee
465+
dpp_qr_code_auth_initiator_either_2
466+
dpp_qr_code_auth_initiator_either_3
463467
dpp_config_legacy
464468
dpp_config_legacy_psk_hex
465469
dpp_config_fragmentation
@@ -471,6 +475,9 @@ dpp_config_dpp_gen_secp521r1
471475
dpp_config_dpp_gen_expiry
472476
dpp_config_dpp_gen_expired_key
473477
dpp_config_dpp_gen_3rd_party
478+
dpp_config_dpp_override_prime256v1
479+
dpp_config_dpp_override_secp384r1
480+
dpp_config_override_objects
474481
dpp_config_signed_connector_error_no_dot_1
475482
dpp_config_signed_connector_error_no_dot_2
476483
dpp_config_signed_connector_error_unexpected_signature_len
@@ -572,6 +579,12 @@ dpp_pkex_nak_curve_change2
572579
dpp_hostapd_configurator
573580
dpp_hostapd_configurator_responder
574581
dpp_hostapd_configurator_fragmentation
582+
dpp_hostapd_enrollee_fragmentation
583+
dpp_hostapd_enrollee_gas_timeout
584+
dpp_hostapd_enrollee_gas_timeout_comeback
585+
dpp_hostapd_enrollee_gas_errors
586+
dpp_hostapd_enrollee_gas_proto
587+
dpp_hostapd_enrollee_gas_tx_status_errors
575588
dpp_hostapd_configurator_override_objects
576589
dpp_own_config
577590
dpp_own_config_group_id

.github/workflows/hostap-vm.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ name: hostap and wpa-supplicant Tests
22

33
# START OF COMMON SECTION
44
on:
5-
push:
6-
branches: [ 'master', 'main', 'release/**' ]
7-
pull_request:
8-
branches: [ '*' ]
5+
workflow_dispatch: # Allows people to run it manually if they want but
6+
# disables it from running automatically when broken
7+
# To restore this to an auto test delete the above workflow_dispatch line and
8+
# comments and uncomment the below lines for push and pull_request
9+
# push:
10+
# branches: [ 'master', 'main', 'release/**' ]
11+
# pull_request:
12+
# branches: [ '*' ]
913

1014
concurrency:
1115
group: ${{ github.workflow }}-${{ github.ref }}
@@ -228,6 +232,16 @@ jobs:
228232
working-directory: hostap
229233
run: git checkout ${{ matrix.config.hostap_ref }}
230234

235+
- name: Update certs
236+
working-directory: hostap/tests/hwsim/auth_serv
237+
run: |
238+
./update.sh
239+
./sha512-generate.sh
240+
# Force regeneration of rsa3072-ca.key to get rsa3072-generate.sh to
241+
# correctly update all the certs
242+
rm rsa3072-ca.key
243+
./rsa3072-generate.sh
244+
231245
- if: ${{ matrix.config.osp_ref }}
232246
name: Checkout OSP
233247
uses: actions/checkout@v4
@@ -245,20 +259,6 @@ jobs:
245259
patch -p1 < $f
246260
done
247261
248-
- name: Update certs
249-
working-directory: hostap/tests/hwsim/auth_serv
250-
run: |
251-
mkdir -p rootCA/newcerts
252-
./update.sh
253-
./ec-generate.sh
254-
./ec2-generate.sh
255-
./sha512-generate.sh
256-
# Force regeneration of rsa3072-ca.key to get rsa3072-generate.sh to
257-
# correctly update all the certs
258-
rm rsa3072-ca.key
259-
./rsa3072-generate.sh
260-
./ica-generate.sh
261-
262262
- name: Apply extra patches
263263
working-directory: hostap
264264
run: |

src/internal.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28751,7 +28751,6 @@ static int ParseCipherList(Suites* suites,
2875128751
haveRSA, 1, 1, !haveRSA, 1, haveRSA, !haveRSA, 0, 0, 1,
2875228752
1, 1, side
2875328753
);
28754-
suites->setSuites = 1;
2875528754
return 1; /* wolfSSL default */
2875628755
}
2875728756

0 commit comments

Comments
 (0)