From 70b8ad926cfd54b586be90bf8575ed63d53b5dc5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 27 Jun 2024 07:38:34 +0200 Subject: [PATCH 1/2] ipq53xx: add EAP105 to CI Signed-off-by: John Crispin --- .github/workflows/build-dev.yml | 2 +- profiles/edgecore_eap105.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 781d2e995..97490a2f5 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf189', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'sercomm_ap72tip', 'udaya_a5-id2', 'udaya_a6-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018-v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ] + target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf189', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'sercomm_ap72tip', 'udaya_a5-id2', 'udaya_a6-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018-v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ] steps: - uses: actions/checkout@v3 diff --git a/profiles/edgecore_eap105.yml b/profiles/edgecore_eap105.yml index 13003aaf6..035f87b5a 100644 --- a/profiles/edgecore_eap105.yml +++ b/profiles/edgecore_eap105.yml @@ -3,7 +3,7 @@ profile: edgecore_eap105 target: ipq53xx subtarget: generic description: Build image for the edgecore eap105 -image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.tar +image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-edgecore_eap105-squashfs-sysupgrade.tar feeds: - name: ipq95xx path: ../../feeds/ipq95xx From a449f08839cf65950284d64a6daeb2d35d0ceebd Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 28 Jun 2024 06:21:36 +0200 Subject: [PATCH 2/2] hostapd: run afc client in insecure mode if the CA is not present Signed-off-by: John Crispin --- feeds/ipq807x_v5.4/hostapd/files/afcd.uc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds/ipq807x_v5.4/hostapd/files/afcd.uc b/feeds/ipq807x_v5.4/hostapd/files/afcd.uc index 9bb7b841a..67a657efb 100644 --- a/feeds/ipq807x_v5.4/hostapd/files/afcd.uc +++ b/feeds/ipq807x_v5.4/hostapd/files/afcd.uc @@ -72,7 +72,7 @@ function handle_request(req) let cl = uclient.new(opts.url, null, cb); - if (!cl.ssl_init({ verify: true, ca_files: [ opts.cert ] })) { + if (!cl.ssl_init({ verify: !!opts.cert, ca_files: [ opts.cert ] })) { warn(`Failed to initialize SSL\n`); return false; }