Skip to content

Commit 595e602

Browse files
committed
Merge branch 'master' into make_rpm_fix
2 parents 02c8748 + 3181e2b commit 595e602

157 files changed

Lines changed: 23414 additions & 1705 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/async.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
matrix:
1919
config: [
2020
# Add new configs here
21-
'--enable-asynccrypt --enable-all --enable-dtls13 --disable-mlkem CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT"',
22-
'--enable-asynccrypt-sw --enable-ocspstapling --enable-ocspstapling2 --disable-mlkem CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
23-
'--enable-asynccrypt --enable-all --enable-dtls13 CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT"',
24-
'--enable-asynccrypt-sw --enable-ocspstapling --enable-ocspstapling2 CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
25-
'--enable-ocsp CFLAGS="-DTEST_NONBLOCK_CERTS -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
21+
'--enable-asynccrypt --enable-all --enable-dtls13 --disable-mlkem CFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT"',
22+
'--enable-asynccrypt-sw --enable-ocspstapling --enable-ocspstapling2 --disable-mlkem CFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
23+
'--enable-asynccrypt --enable-all --enable-dtls13 CFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT"',
24+
'--enable-asynccrypt-sw --enable-ocspstapling --enable-ocspstapling2 CFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
25+
'--enable-ocsp CFLAGS="-DTEST_NONBLOCK_CERTS -pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
2626
]
2727
name: make check
2828
if: github.repository_owner == 'wolfssl'

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
check_filenames: true
2424
check_hidden: true
2525
# Add comma separated list of words that occur multiple times that should be ignored (sorted alphabetically, case sensitive)
26-
ignore_words_list: adin,aNULL,brunch,carryIn,chainG,ciph,cLen,cliKs,dout,haveA,inCreated,inOut,inout,larg,LEAPYEAR,Merget,optionA,parm,parms,repid,rIn,userA,ser,siz,te,Te,HSI,failT,
26+
ignore_words_list: adin,aNULL,brunch,carryIn,chainG,ciph,cLen,cliKs,dout,haveA,inCreated,inOut,inout,larg,LEAPYEAR,Merget,optionA,parm,parms,repid,rIn,userA,ser,siz,te,Te,HSI,failT,toLen,
2727
# The exclude_file contains lines of code that should be ignored. This is useful for individual lines which have non-words that can safely be ignored.
2828
exclude_file: '.codespellexcludelines'
2929
# To skip files entirely from being processed, add it to the following list:

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ ap_wpa2_eap_sim_imsi_privacy_attr
238238
ap_wpa2_eap_sim_imsi_privacy_key
239239
ap_wpa2_eap_sim_no_change_set
240240
ap_wpa2_eap_sim_oom
241-
ap_wpa2_eap_sim_sql
242-
ap_wpa2_eap_sim_sql_fallback_to_pseudonym
243241
ap_wpa2_eap_sim_zero_db_timeout
244242
ap_wpa2_eap_tls_13_ec
245243
ap_wpa2_eap_tls_13_missing_prot_success
@@ -248,9 +246,6 @@ ap_wpa2_eap_tls_check_cert_subject_neg
248246
ap_wpa2_eap_tls_diff_ca_trust2
249247
ap_wpa2_eap_tls_domain_mismatch_cn
250248
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
254249
ap_wpa2_eap_tls_neg_incorrect_trust_root
255250
ap_wpa2_eap_tls_ocsp_multi
256251
ap_wpa2_eap_tls_ocsp_multi_revoked
@@ -649,9 +644,6 @@ dpp_config_dpp_gen_secp521r1
649644
dpp_config_dpp_gen_secp521r1_prime256v1
650645
dpp_config_dpp_gen_secp521r1_secp384r1
651646
dpp_config_dpp_gen_secp521r1_secp521r1
652-
dpp_config_dpp_override_prime256v1
653-
dpp_config_dpp_override_secp384r1
654-
dpp_config_dpp_override_secp521r1
655647
dpp_config_error_legacy_invalid_psk
656648
dpp_config_error_legacy_no_pass
657649
dpp_config_error_legacy_no_pass_for_sae
@@ -691,7 +683,6 @@ dpp_config_no_discovery
691683
dpp_config_no_discovery_ssid
692684
dpp_config_no_signed_connector
693685
dpp_config_no_wi_fi_tech
694-
dpp_config_override_objects
695686
dpp_config_root_not_an_object
696687
dpp_config_save
697688
dpp_config_save2
@@ -748,12 +739,6 @@ dpp_hostapd_configurator_enrollee_v1
748739
dpp_hostapd_configurator_fragmentation
749740
dpp_hostapd_configurator_override_objects
750741
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
757742
dpp_intro_mismatch
758743
dpp_invalid_configurator_key
759744
dpp_invalid_legacy_params
@@ -906,10 +891,6 @@ dpp_qr_code_auth_incompatible_roles2
906891
dpp_qr_code_auth_incompatible_roles_failure
907892
dpp_qr_code_auth_incompatible_roles_failure2
908893
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
913894
dpp_qr_code_auth_mutual
914895
dpp_qr_code_auth_mutual2
915896
dpp_qr_code_auth_mutual_bp_256

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ ap_wpa2_eap_sim
219219
ap_wpa2_eap_sim_imsi_identity
220220
ap_wpa2_eap_sim_imsi_privacy_key
221221
ap_wpa2_eap_sim_imsi_privacy_attr
222-
ap_wpa2_eap_sim_sql
223222
ap_wpa2_eap_sim_config
224223
ap_wpa2_eap_sim_id_0
225224
ap_wpa2_eap_sim_id_1
@@ -347,7 +346,6 @@ ap_wpa2_eap_tls_ocsp_server_signed
347346
ap_wpa2_eap_tls_ocsp_invalid_data
348347
ap_wpa2_eap_tls_ocsp_invalid
349348
ap_wpa2_eap_tls_ocsp_unknown_sign
350-
ap_wpa2_eap_tls_intermediate_ca
351349
ap_wpa2_eap_tls_ocsp_multi_revoked
352350
ap_wpa2_eap_tls_domain_suffix_match_cn_full
353351
ap_wpa2_eap_tls_domain_match_cn
@@ -461,9 +459,6 @@ dpp_qr_code_auth_mutual_not_used
461459
dpp_qr_code_auth_mutual_curve_mismatch
462460
dpp_qr_code_auth_hostapd_mutual2
463461
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
467462
dpp_config_legacy
468463
dpp_config_legacy_psk_hex
469464
dpp_config_fragmentation
@@ -475,9 +470,6 @@ dpp_config_dpp_gen_secp521r1
475470
dpp_config_dpp_gen_expiry
476471
dpp_config_dpp_gen_expired_key
477472
dpp_config_dpp_gen_3rd_party
478-
dpp_config_dpp_override_prime256v1
479-
dpp_config_dpp_override_secp384r1
480-
dpp_config_override_objects
481473
dpp_config_signed_connector_error_no_dot_1
482474
dpp_config_signed_connector_error_no_dot_2
483475
dpp_config_signed_connector_error_unexpected_signature_len
@@ -579,12 +571,6 @@ dpp_pkex_nak_curve_change2
579571
dpp_hostapd_configurator
580572
dpp_hostapd_configurator_responder
581573
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
588574
dpp_hostapd_configurator_override_objects
589575
dpp_own_config
590576
dpp_own_config_group_id

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ ap_wpa2_psk_ext_key_id_ptk_rekey_sta0
176176
ap_wpa2_psk_ext_key_id_ptk_rekey_sta1
177177
ap_wpa2_psk_ext_key_id_ptk_rekey_sta2
178178
ap_wpa2_eap_sim
179-
ap_wpa2_eap_sim_sql
180179
ap_wpa2_eap_sim_config
181180
ap_wpa2_eap_sim_id_0
182181
ap_wpa2_eap_sim_id_1

.github/workflows/hostap-vm.yml

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

33
# START OF COMMON SECTION
44
on:
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: [ '*' ]
5+
push:
6+
branches: [ 'master', 'main', 'release/**' ]
7+
pull_request:
8+
branches: [ '*' ]
139

1410
concurrency:
1511
group: ${{ github.workflow }}-${{ github.ref }}
@@ -230,16 +226,6 @@ jobs:
230226
working-directory: hostap
231227
run: git checkout ${{ matrix.config.hostap_ref }}
232228

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

.github/workflows/multi-arch.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
my_matrix:
17-
name: Multi-arch test
17+
name: Multi-arch test (${{ matrix.ARCH }}, ${{ matrix.opts.name }})
1818
strategy:
1919
fail-fast: false
2020
matrix:
@@ -37,7 +37,20 @@ jobs:
3737
CFLAGS: -marm -DWOLFSSL_SP_ARM_ARCH=6
3838
ARCH: armel
3939
EXTRA_OPTS: --enable-sp-asm
40-
opts: [ '-O2', '-O3', '-O1 -UFP_ECC', '-O0', '-Os', '-Ofast' ]
40+
opts:
41+
- name: '-O2'
42+
OPT_CFLAGS: '-O2'
43+
- name: '-O2 sp-math'
44+
OPT_CFLAGS: '-O2'
45+
OPT_EXTRA_OPTS: '--enable-sp-math'
46+
- name: '-O1 -UFP_ECC'
47+
OPT_CFLAGS: '-O1 -UFP_ECC'
48+
- name: '-O0'
49+
OPT_CFLAGS: '-O0'
50+
- name: '-Os'
51+
OPT_CFLAGS: '-Os'
52+
- name: '-Ofast'
53+
OPT_CFLAGS: '-Ofast'
4154
if: github.repository_owner == 'wolfssl'
4255
runs-on: ubuntu-22.04
4356
# This should be a safe limit for the tests to run.
@@ -48,12 +61,12 @@ jobs:
4861
sudo apt update
4962
sudo apt install -y crossbuild-essential-${{ matrix.ARCH }} qemu-user
5063
- uses: actions/checkout@v4
51-
- name: Build for ${{ matrix.ARCH }} with Opt Level ${{ matrix.opts }}
64+
- name: Build for ${{ matrix.ARCH }} with ${{ matrix.opts.name }}
5265
env:
5366
CC: ${{ matrix.CC }}
54-
CFLAGS: ${{ matrix.CFLAGS }} ${{ matrix.opts }}
67+
CFLAGS: ${{ matrix.CFLAGS }} ${{ matrix.opts.OPT_CFLAGS }}
5568
QEMU_LD_PREFIX: /usr/${{ matrix.HOST }}
56-
run: ./autogen.sh && ./configure --host=${{ matrix.HOST }} --enable-all --disable-examples CPPFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT" ${{ matrix.EXTRA_OPTS }} && make
69+
run: ./autogen.sh && ./configure --host=${{ matrix.HOST }} --enable-all --disable-examples CPPFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT" ${{ matrix.EXTRA_OPTS }} ${{ matrix.opts.OPT_EXTRA_OPTS }} && make
5770
- name: Print errors
5871
if: ${{ failure() }}
5972
run: |

.github/workflows/multi-compiler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
env:
5252
CC: ${{ matrix.CC }}
5353
CXX: ${{ matrix.CXX }}
54-
run: ./autogen.sh && ./configure CFLAGS="-pedantic -Wdeclaration-after-statement" && make && make dist
54+
run: ./autogen.sh && ./configure CFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference" && make && make dist
5555
- name: Show log on errors
5656
if: ${{ failure() }}
5757
run: |

.github/workflows/no-malloc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
matrix:
1919
config: [
2020
# Add new configs here
21-
'--enable-rsa --enable-keygen --disable-dh CFLAGS="-DWOLFSSL_NO_MALLOC -DRSA_MIN_SIZE=1024 -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
22-
'--enable-ecc --enable-rsa --enable-keygen --enable-ed25519 --enable-curve25519 --enable-ed448 --enable-curve448 --enable-mlkem CFLAGS="-DWOLFSSL_NO_MALLOC -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
23-
'--enable-ecc --enable-rsa --enable-keygen --enable-ed25519 --enable-curve25519 --enable-ed448 --enable-curve448 --enable-mlkem --enable-staticmemory CFLAGS="-DWOLFSSL_NO_MALLOC -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
21+
'--enable-rsa --enable-keygen --disable-dh CFLAGS="-DWOLFSSL_NO_MALLOC -DRSA_MIN_SIZE=1024 -pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
22+
'--enable-ecc --enable-rsa --enable-keygen --enable-ed25519 --enable-curve25519 --enable-ed448 --enable-curve448 --enable-mlkem CFLAGS="-DWOLFSSL_NO_MALLOC -pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
23+
'--enable-ecc --enable-rsa --enable-keygen --enable-ed25519 --enable-curve25519 --enable-ed448 --enable-curve448 --enable-mlkem --enable-staticmemory CFLAGS="-DWOLFSSL_NO_MALLOC -pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
2424
]
2525
name: make check
2626
if: github.repository_owner == 'wolfssl'

.github/workflows/no-tls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
config: [
2020
# Add new configs here
21-
'--disable-tls --enable-all CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
21+
'--disable-tls --enable-all CFLAGS="-pedantic -Wdeclaration-after-statement -Wnull-dereference -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
2222
]
2323
name: make check
2424
if: github.repository_owner == 'wolfssl'

0 commit comments

Comments
 (0)