Skip to content

Commit 887c5ab

Browse files
authored
Merge pull request #7949 from douzzer/20240905-whitespace-and-utf8-cleanup
20240905-whitespace-and-utf8-cleanup
2 parents 9f6a75c + a3fb502 commit 887c5ab

194 files changed

Lines changed: 1264 additions & 1269 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
./configure ${{ matrix.config }}
3737
make check
3838
39-
- name: Print errors
39+
- name: Print errors
4040
if: ${{ failure() }}
4141
run: |
4242
if [ -f test-suite.log ] ; then

.github/workflows/disabled/haproxy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@ jobs:
5757
- name: Test HaProxy
5858
working-directory: haproxy
5959
run: make reg-tests reg-tests/ssl VTEST_PROGRAM=$GITHUB_WORKSPACE/VTest/vtest
60-

.github/workflows/disabled/hostap.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
- name: Checkout hostap
182182
uses: actions/checkout@v4
183183
with:
184-
repository: julek-wolfssl/hostap-mirror
184+
repository: julek-wolfssl/hostap-mirror
185185
path: hostap
186186
ref: ${{ matrix.config.hostap_ref }}
187187
# necessary for cherry pick step
@@ -210,7 +210,7 @@ jobs:
210210
done
211211
212212
- if: ${{ matrix.hostapd }}
213-
name: Setup hostapd config file
213+
name: Setup hostapd config file
214214
run: |
215215
cp wolfssl/.github/workflows/hostap-files/configs/${{ matrix.config.hostap_ref }}/hostapd.config \
216216
hostap/hostapd/.config
@@ -220,7 +220,7 @@ jobs:
220220
EOF
221221
222222
- if: ${{ matrix.wpa_supplicant }}
223-
name: Setup wpa_supplicant config file
223+
name: Setup wpa_supplicant config file
224224
run: |
225225
cp wolfssl/.github/workflows/hostap-files/configs/${{ matrix.config.hostap_ref }}/wpa_supplicant.config \
226226
hostap/wpa_supplicant/.config

.github/workflows/hitch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ jobs:
105105
working-directory: ./hitch
106106
run: |
107107
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/build-dir/lib:$LD_LIBRARY_PATH
108-
make check
108+
make check

.github/workflows/hostap-vm.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
wolf_extra_config: --disable-tls13
2525
- build_id: hostap-vm-build2
2626
wolf_extra_config: >-
27-
--enable-wpas-dpp --enable-brainpool --with-eccminsz=192
27+
--enable-wpas-dpp --enable-brainpool --with-eccminsz=192
2828
--enable-tlsv10 --enable-oldtls
2929
name: Build wolfSSL
3030
runs-on: ubuntu-latest
@@ -87,7 +87,7 @@ jobs:
8787
if: steps.cache.outputs.cache-hit != 'true'
8888
uses: actions/checkout@v4
8989
with:
90-
repository: torvalds/linux
90+
repository: torvalds/linux
9191
path: linux
9292

9393
- name: Compile linux
@@ -199,7 +199,7 @@ jobs:
199199
- name: Checkout hostap
200200
uses: actions/checkout@v4
201201
with:
202-
repository: julek-wolfssl/hostap-mirror
202+
repository: julek-wolfssl/hostap-mirror
203203
path: hostap
204204
ref: ${{ matrix.config.hostap_ref }}
205205

@@ -233,7 +233,7 @@ jobs:
233233
fi
234234
235235
- if: ${{ matrix.hostapd }}
236-
name: Setup hostapd config file
236+
name: Setup hostapd config file
237237
run: |
238238
cp wolfssl/.github/workflows/hostap-files/configs/${{ matrix.config.hostap_ref }}/hostapd.config \
239239
hostap/hostapd/.config
@@ -243,7 +243,7 @@ jobs:
243243
EOF
244244
245245
- if: ${{ matrix.wpa_supplicant }}
246-
name: Setup wpa_supplicant config file
246+
name: Setup wpa_supplicant config file
247247
run: |
248248
cp wolfssl/.github/workflows/hostap-files/configs/${{ matrix.config.hostap_ref }}/wpa_supplicant.config \
249249
hostap/wpa_supplicant/.config

.github/workflows/ipmitool.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,3 @@ jobs:
7979
run: |
8080
ldd src/ipmitool | grep wolfssl
8181
ldd src/ipmievd | grep wolfssl
82-

.github/workflows/mosquitto.yml

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
1-
name: mosquitto Tests
2-
3-
# START OF COMMON SECTION
4-
on:
5-
push:
6-
branches: [ 'master', 'main', 'release/**' ]
7-
pull_request:
8-
branches: [ '*' ]
9-
10-
concurrency:
11-
group: ${{ github.workflow }}-${{ github.ref }}
12-
cancel-in-progress: true
13-
# END OF COMMON SECTION
14-
15-
jobs:
16-
build_wolfssl:
17-
name: Build wolfSSL
18-
# Just to keep it the same as the testing target
19-
runs-on: ubuntu-latest
20-
# This should be a safe limit for the tests to run.
21-
timeout-minutes: 4
22-
steps:
23-
- name: Build wolfSSL
24-
uses: wolfSSL/actions-build-autotools-project@v1
25-
with:
26-
path: wolfssl
27-
configure: --enable-mosquitto CFLAGS="-DALLOW_INVALID_CERTSIGN"
28-
install: true
29-
30-
- name: tar build-dir
31-
run: tar -zcf build-dir.tgz build-dir
32-
33-
- name: Upload built lib
34-
uses: actions/upload-artifact@v4
35-
with:
36-
name: wolf-install-mosquitto
37-
path: build-dir.tgz
38-
retention-days: 5
39-
40-
mosquitto_check:
41-
strategy:
42-
fail-fast: false
43-
matrix:
44-
ref: [ 2.0.18 ]
45-
name: ${{ matrix.ref }}
46-
runs-on: ubuntu-latest
47-
# This should be a safe limit for the tests to run.
48-
timeout-minutes: 4
49-
needs: build_wolfssl
50-
steps:
51-
- name: Download lib
52-
uses: actions/download-artifact@v4
53-
with:
54-
name: wolf-install-mosquitto
55-
56-
- name: untar build-dir
57-
run: tar -xf build-dir.tgz
58-
59-
- name: Checkout OSP
60-
uses: actions/checkout@v4
61-
with:
62-
repository: wolfssl/osp
63-
path: osp
64-
65-
- name: Install dependencies
66-
run: |
67-
export DEBIAN_FRONTEND=noninteractive
68-
sudo apt-get update
69-
sudo apt-get install -y build-essential libev-dev libssl-dev automake python3-docutils libcunit1 libcunit1-doc libcunit1-dev pkg-config make
70-
sudo pip install --upgrade psutil
71-
72-
- name: Checkout mosquitto
73-
uses: actions/checkout@v4
74-
with:
75-
repository: eclipse/mosquitto
76-
ref: v${{ matrix.ref }}
77-
path: mosquitto
78-
79-
- name: Configure and build mosquitto
80-
run: |
81-
cd $GITHUB_WORKSPACE/mosquitto/
82-
patch -p1 < $GITHUB_WORKSPACE/osp/mosquitto/${{ matrix.ref }}.patch
83-
make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no WOLFSSLDIR=$GITHUB_WORKSPACE/build-dir
84-
85-
- name: Run mosquitto tests
86-
working-directory: ./mosquitto
87-
run: |
88-
# Retry up to five times
89-
for i in {1..5}; do
90-
TEST_RES=0
91-
make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no WOLFSSLDIR=$GITHUB_WORKSPACE/build-dir ptest || TEST_RES=$?
92-
if [ "$TEST_RES" -eq "0" ]; then
93-
break
94-
fi
95-
done
96-
if [ "$TEST_RES" -ne "0" ]; then
97-
exit $TEST_RES
98-
fi
1+
name: mosquitto Tests
2+
3+
# START OF COMMON SECTION
4+
on:
5+
push:
6+
branches: [ 'master', 'main', 'release/**' ]
7+
pull_request:
8+
branches: [ '*' ]
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
# END OF COMMON SECTION
14+
15+
jobs:
16+
build_wolfssl:
17+
name: Build wolfSSL
18+
# Just to keep it the same as the testing target
19+
runs-on: ubuntu-latest
20+
# This should be a safe limit for the tests to run.
21+
timeout-minutes: 4
22+
steps:
23+
- name: Build wolfSSL
24+
uses: wolfSSL/actions-build-autotools-project@v1
25+
with:
26+
path: wolfssl
27+
configure: --enable-mosquitto CFLAGS="-DALLOW_INVALID_CERTSIGN"
28+
install: true
29+
30+
- name: tar build-dir
31+
run: tar -zcf build-dir.tgz build-dir
32+
33+
- name: Upload built lib
34+
uses: actions/upload-artifact@v4
35+
with:
36+
name: wolf-install-mosquitto
37+
path: build-dir.tgz
38+
retention-days: 5
39+
40+
mosquitto_check:
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
ref: [ 2.0.18 ]
45+
name: ${{ matrix.ref }}
46+
runs-on: ubuntu-latest
47+
# This should be a safe limit for the tests to run.
48+
timeout-minutes: 4
49+
needs: build_wolfssl
50+
steps:
51+
- name: Download lib
52+
uses: actions/download-artifact@v4
53+
with:
54+
name: wolf-install-mosquitto
55+
56+
- name: untar build-dir
57+
run: tar -xf build-dir.tgz
58+
59+
- name: Checkout OSP
60+
uses: actions/checkout@v4
61+
with:
62+
repository: wolfssl/osp
63+
path: osp
64+
65+
- name: Install dependencies
66+
run: |
67+
export DEBIAN_FRONTEND=noninteractive
68+
sudo apt-get update
69+
sudo apt-get install -y build-essential libev-dev libssl-dev automake python3-docutils libcunit1 libcunit1-doc libcunit1-dev pkg-config make
70+
sudo pip install --upgrade psutil
71+
72+
- name: Checkout mosquitto
73+
uses: actions/checkout@v4
74+
with:
75+
repository: eclipse/mosquitto
76+
ref: v${{ matrix.ref }}
77+
path: mosquitto
78+
79+
- name: Configure and build mosquitto
80+
run: |
81+
cd $GITHUB_WORKSPACE/mosquitto/
82+
patch -p1 < $GITHUB_WORKSPACE/osp/mosquitto/${{ matrix.ref }}.patch
83+
make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no WOLFSSLDIR=$GITHUB_WORKSPACE/build-dir
84+
85+
- name: Run mosquitto tests
86+
working-directory: ./mosquitto
87+
run: |
88+
# Retry up to five times
89+
for i in {1..5}; do
90+
TEST_RES=0
91+
make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no WOLFSSLDIR=$GITHUB_WORKSPACE/build-dir ptest || TEST_RES=$?
92+
if [ "$TEST_RES" -eq "0" ]; then
93+
break
94+
fi
95+
done
96+
if [ "$TEST_RES" -ne "0" ]; then
97+
exit $TEST_RES
98+
fi

.github/workflows/multi-arch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
CFLAGS: ${{ matrix.CFLAGS }}
5252
QEMU_LD_PREFIX: /usr/${{ matrix.HOST }}
5353
run: ./autogen.sh && ./configure --host=${{ matrix.HOST }} --enable-all --disable-examples ${{ matrix.EXTRA_OPTS }} && make
54-
- name: Print errors
54+
- name: Print errors
5555
if: ${{ failure() }}
5656
run: |
5757
if [ -f config.log ] ; then

.github/workflows/net-snmp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: untar build-dir
6060
run: tar -xf build-dir.tgz
61-
61+
6262
- name: Checkout OSP
6363
uses: actions/checkout@v4
6464
with:

.github/workflows/nginx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
stream_ssl_preread.t stream_ssl_realip.t stream_ssl_session_reuse.t stream_ssl.t
9797
stream_ssl_variables.t stream_ssl_verify_client.t stream_upstream_zone_ssl.t
9898
upstream_zone_ssl.t uwsgi_ssl_certificate.t uwsgi_ssl_certificate_vars.t
99-
uwsgi_ssl.t uwsgi_ssl_verify.t
99+
uwsgi_ssl.t uwsgi_ssl_verify.t
100100
# Following tests do not pass with sanitizer on (with OpenSSL too)
101101
sanitize-not-ok: >-
102102
grpc_ssl.t h2_proxy_request_buffering_ssl.t h2_proxy_ssl.t
@@ -221,4 +221,4 @@ jobs:
221221
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/build-dir/lib \
222222
TMPDIR=$GITHUB_WORKSPACE TEST_NGINX_BINARY=../nginx/objs/nginx \
223223
prove ${{ matrix.sanitize-ok }}
224-
224+

0 commit comments

Comments
 (0)