Skip to content

Commit 3e5e16f

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #6641 from julek-wolfssl/gh/6555
Dtls13GetRnMask: Correctly get chacha counter on BE systems
2 parents 48434f7 + 5cf4224 commit 3e5e16f

15 files changed

Lines changed: 77 additions & 39 deletions

File tree

‎.github/workflows/async.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
]
1616
name: make check
1717
runs-on: ubuntu-latest
18+
# This should be a safe limit for the tests to run.
19+
timeout-minutes: 6
1820
steps:
1921
- uses: actions/checkout@v3
2022
name: Checkout wolfSSL

‎.github/workflows/curl.yml‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,26 @@ on:
55

66
jobs:
77
build:
8-
98
runs-on: ubuntu-latest
10-
9+
# This should be a safe limit for the tests to run.
10+
timeout-minutes: 14
1111
steps:
12-
- uses: actions/checkout@master
13-
- name: autogen
14-
run: ./autogen.sh
15-
- name: configure
16-
run: ./configure --enable-all
17-
- name: make
18-
run: make
19-
- name: install
20-
run: sudo make install
21-
- uses: actions/checkout@master
12+
- name: Install test dependencies
13+
run: |
14+
sudo apt-get update
15+
sudo apt-get install nghttp2
16+
17+
- name: Build wolfSSL
18+
uses: wolfSSL/actions-build-autotools-project@v1
19+
with:
20+
path: wolfssl
21+
configure: --enable-curl
22+
install: true
23+
24+
- name: Build and test stunnel
25+
uses: wolfSSL/actions-build-autotools-project@v1
2226
with:
2327
repository: curl/curl
2428
path: curl
25-
- name: Install test dependency
26-
working-directory: ./curl
27-
run: sudo apt-get install nghttp2
28-
- name: curl buildconf
29-
working-directory: ./curl
30-
run: ./buildconf
31-
- name: curl configure
32-
working-directory: ./curl
33-
run: ./configure --with-wolfssl
34-
- name: curl make
35-
working-directory: ./curl
36-
run: make
37-
- name: curl unit tests
38-
working-directory: ./curl
39-
run: make test
40-
29+
configure: --with-wolfssl=$GITHUB_WORKSPACE/build-dir
30+
check: true

‎.github/workflows/docker-Espressif.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ jobs:
66
espressif_latest:
77
name: latest Docker container
88
runs-on: ubuntu-latest
9+
# This should be a safe limit for the tests to run.
10+
timeout-minutes: 12
911
container:
1012
image: espressif/idf:latest
1113
steps:

‎.github/workflows/docker-OpenWrt.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
build_library:
1010
name: Compile libwolfssl.so
1111
runs-on: ubuntu-latest
12+
# This should be a safe limit for the tests to run.
13+
timeout-minutes: 4
1214
container:
1315
image: alpine:latest
1416
steps:
@@ -26,6 +28,8 @@ jobs:
2628
compile_container:
2729
name: Compile container
2830
runs-on: ubuntu-latest
31+
# This should be a safe limit for the tests to run.
32+
timeout-minutes: 2
2933
needs: build_library
3034
strategy:
3135
fail-fast: false

‎.github/workflows/hitch.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ jobs:
88
name: Build wolfSSL
99
# Just to keep it the same as the testing target
1010
runs-on: ubuntu-latest
11+
# This should be a safe limit for the tests to run.
12+
timeout-minutes: 4
1113
steps:
1214
- name: Build wolfSSL
1315
uses: wolfSSL/actions-build-autotools-project@v1
@@ -34,6 +36,8 @@ jobs:
3436
test13-r82.sh test15-proxy-v2-npn.sh test39-client-cert-proxy.sh
3537
name: ${{ matrix.ref }}
3638
runs-on: ubuntu-latest
39+
# This should be a safe limit for the tests to run.
40+
timeout-minutes: 4
3741
needs: build_wolfssl
3842
steps:
3943
- name: Download lib

‎.github/workflows/hostap.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
name: Build wolfSSL
1616
# Just to keep it the same as the testing target
1717
runs-on: ubuntu-20.04
18+
# This should be a safe limit for the tests to run.
19+
timeout-minutes: 4
1820
steps:
1921
# No way to view the full strategy in the browser (really weird)
2022
- name: Print strategy
@@ -90,6 +92,8 @@ jobs:
9092
name: hwsim test
9193
# For openssl 1.1
9294
runs-on: ubuntu-20.04
95+
# This should be a safe limit for the tests to run.
96+
timeout-minutes: 12
9397
needs: build_wolfssl
9498
steps:
9599
# No way to view the full strategy in the browser (really weird)

‎.github/workflows/multi-compiler.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
- CC: clang-14
2626
CXX: clang++-14
2727
runs-on: ubuntu-latest
28+
# This should be a safe limit for the tests to run.
29+
timeout-minutes: 2
2830
steps:
2931
- uses: actions/checkout@v3
3032
- name: Build

‎.github/workflows/nginx.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ jobs:
88
name: Build wolfSSL
99
# Just to keep it the same as the testing target
1010
runs-on: ubuntu-latest
11+
# This should be a safe limit for the tests to run.
12+
timeout-minutes: 4
1113
steps:
1214
- if: ${{ runner.debug }}
1315
name: Enable wolfSSL debug logging
@@ -65,6 +67,8 @@ jobs:
6567
stream_proxy_ssl_verify.t stream_ssl_alpn.t
6668
name: ${{ matrix.ref }}
6769
runs-on: ubuntu-latest
70+
# This should be a safe limit for the tests to run.
71+
timeout-minutes: 6
6872
needs: build_wolfssl
6973
steps:
7074
- name: Download lib

‎.github/workflows/openvpn.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ jobs:
88
name: Build wolfSSL
99
# Just to keep it the same as the testing target
1010
runs-on: ubuntu-latest
11+
# This should be a safe limit for the tests to run.
12+
timeout-minutes: 4
1113
steps:
1214
- name: Build wolfSSL
1315
uses: wolfSSL/actions-build-autotools-project@v1
@@ -31,6 +33,8 @@ jobs:
3133
ref: [ master, release/2.6, v2.6.0 ]
3234
name: ${{ matrix.ref }}
3335
runs-on: ubuntu-latest
36+
# This should be a safe limit for the tests to run.
37+
timeout-minutes: 6
3438
needs: build_wolfssl
3539
steps:
3640
- name: Download lib

‎.github/workflows/os-check.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
]
2323
name: make check
2424
runs-on: ${{ matrix.os }}
25+
# This should be a safe limit for the tests to run.
26+
timeout-minutes: 8
2527
steps:
2628
- name: Build and test wolfSSL
2729
uses: wolfSSL/actions-build-autotools-project@v1
@@ -40,6 +42,8 @@ jobs:
4042
]
4143
name: make user_setting.h
4244
runs-on: ${{ matrix.os }}
45+
# This should be a safe limit for the tests to run.
46+
timeout-minutes: 6
4347
steps:
4448
- name: Build and test wolfSSL
4549
uses: wolfSSL/actions-build-autotools-project@v1
@@ -61,6 +65,8 @@ jobs:
6165
]
6266
name: make user_setting.h (testwolfcrypt only)
6367
runs-on: ${{ matrix.os }}
68+
# This should be a safe limit for the tests to run.
69+
timeout-minutes: 4
6470
steps:
6571
- name: Build and test wolfSSL
6672
uses: wolfSSL/actions-build-autotools-project@v1
@@ -80,6 +86,8 @@ jobs:
8086
os: [ ubuntu-latest, macos-latest ]
8187
name: make user_setting.h (with sed)
8288
runs-on: ${{ matrix.os }}
89+
# This should be a safe limit for the tests to run.
90+
timeout-minutes: 8
8391
steps:
8492
- uses: actions/checkout@v3
8593
- if: ${{ matrix.os == 'macos-latest' }}
@@ -96,6 +104,8 @@ jobs:
96104
windows_build:
97105
name: Windows Build Test
98106
runs-on: windows-latest
107+
# This should be a safe limit for the tests to run.
108+
timeout-minutes: 6
99109
env:
100110
# Path to the solution file relative to the root of the project.
101111
SOLUTION_FILE_PATH: wolfssl64.sln

0 commit comments

Comments
 (0)