Skip to content

Commit 1612c6c

Browse files
Test Userpadelsbach
Test User
authored and
padelsbach
committed
Rebase and fix ssh-git-test actions
1 parent 93430f0 commit 1612c6c

39 files changed

Lines changed: 1067 additions & 155 deletions

‎.github/workflows/asan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Asan Test
33
# START OF COMMON SECTION
44
on:
55
push:
6-
branches: [ "*" ]
6+
branches: [ '*' ]
77
pull_request:
8-
branches: [ "*" ]
8+
branches: [ '*' ]
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/bind9.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ jobs:
113113
working-directory: bind9
114114
shell: bash
115115
run: |
116+
# Verify wolfProvider is properly installed
117+
source $GITHUB_WORKSPACE/scripts/verify-debian.sh
118+
116119
set +o pipefail # ignore errors from make check
117120
autoreconf -ivf
118121
./configure

‎.github/workflows/cjose.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ jobs:
8888
apt install --reinstall -y \
8989
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
9090
91-
92-
93-
- name: Check wolfProvider is installed
94-
run: |
95-
openssl list -providers
96-
openssl list -providers | grep -q "wolfSSL Provider" || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
97-
9891
- name: Download cjose
9992
uses: actions/checkout@v4
10093
with:
@@ -114,10 +107,8 @@ jobs:
114107
- name: Run cjose tests
115108
working-directory: cjose
116109
run: |
117-
# wolfProvider is already loaded as the default provider
118-
echo "Current OpenSSL providers:"
119-
openssl list -providers
120-
openssl list -providers | grep -q "wolfSSL Provider" || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
110+
# Verify wolfProvider is properly installed
111+
. $GITHUB_WORKSPACE/scripts/verify-debian.sh
121112
export ${{ matrix.force_fail }}
122113
123114
make test 2>&1 | tee cjose-test.log

‎.github/workflows/curl.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ jobs:
4141
openssl_ref: [ 'openssl-3.5.2' ]
4242
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4343
replace_default: [ true ]
44-
exclude:
45-
- curl_ref: 'master'
46-
force_fail: 'WOLFPROV_FORCE_FAIL=1'
4744
env:
4845
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4946
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -110,6 +107,8 @@ jobs:
110107
working-directory: curl
111108
shell: bash
112109
run: |
110+
# Verify wolfProvider is properly installed
111+
source $GITHUB_WORKSPACE/scripts/verify-debian.sh
113112
set +o pipefail # ignore errors from make check
114113
export ${{ matrix.force_fail }}
115114
export CURL_REF=${{ matrix.curl_ref }}

‎.github/workflows/git-ssh-dr.yml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: Git SSH Default Replace Tests
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'main', 'release/**', ]
6+
pull_request:
7+
branches: [ '*' ]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
build_wolfprovider:
15+
uses: ./.github/workflows/build-wolfprovider.yml
16+
with:
17+
wolfssl_ref: ${{ matrix.wolfssl_ref }}
18+
openssl_ref: 'openssl-3.5.0'
19+
replace_default: true
20+
strategy:
21+
matrix:
22+
wolfssl_ref: ['master', 'v5.8.2-stable']
23+
24+
git-ssh-default-replace-test:
25+
runs-on: ubuntu-22.04
26+
container:
27+
image: debian:bookworm
28+
env:
29+
DEBIAN_FRONTEND: noninteractive
30+
needs: build_wolfprovider
31+
# This should be a safe limit for the tests to run.
32+
timeout-minutes: 20
33+
strategy:
34+
matrix:
35+
wolfssl_ref: ['master', 'v5.8.2-stable']
36+
key_type: ['rsa', 'ecdsa', 'ed25519']
37+
iterations: [10] # Total of 50 runs
38+
env:
39+
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
40+
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
41+
WOLFPROV_PACKAGES_PATH: /tmp/wolfprov-packages
42+
43+
steps:
44+
- name: Checkout wolfProvider
45+
uses: actions/checkout@v4
46+
with:
47+
fetch-depth: 1
48+
49+
- name: Checking OpenSSL/wolfProvider packages in cache
50+
uses: actions/cache/restore@v4
51+
id: wolfprov-cache
52+
with:
53+
path: |
54+
${{ env.WOLFSSL_PACKAGES_PATH }}
55+
${{ env.OPENSSL_PACKAGES_PATH }}
56+
${{ env.WOLFPROV_PACKAGES_PATH }}
57+
key: openssl-wolfprov-debian-packages-${{ github.sha }}-replace-default
58+
fail-on-cache-miss: true
59+
60+
- name: Install wolfSSL/OpenSSL/wolfprov packages
61+
run: |
62+
printf "Installing OpenSSL/wolfProvider packages:\n"
63+
ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
64+
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
65+
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
66+
67+
apt install --reinstall -y \
68+
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
69+
70+
apt install --reinstall -y \
71+
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
72+
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
73+
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
74+
75+
apt install --reinstall -y \
76+
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
77+
78+
- name: Set up environment
79+
run: |
80+
export DEBIAN_FRONTEND=noninteractive
81+
apt-get update
82+
apt-get install -y openssh-client openssh-server expect xxd git \
83+
net-tools git-all
84+
85+
- name: Run git + replace default + ssh test
86+
shell: bash
87+
run: |
88+
# Verify wolfProvider is properly installed
89+
source scripts/verify-debian.sh
90+
91+
echo "=== Running Git + replace default + ssh Test ==="
92+
echo "Using the local test script for consistent testing"
93+
# Run the test with the matrix parameters
94+
echo "Testing with key type: ${{ matrix.key_type }}"
95+
echo "Running ${{ matrix.iterations }} iterations"
96+
97+
# Run the scripts test
98+
./scripts/test-git-ssh-dr.sh \
99+
--key-types "${{ matrix.key_type }}" \
100+
--iterations "${{ matrix.iterations }}" \
101+
--verbose
102+
103+
echo "=== Test completed for ${{ matrix.key_type }} ==="

‎.github/workflows/grpc.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ jobs:
9090
- name: Install prerequisites
9191
run: |
9292
apt-get update
93-
apt-get install -y build-essential autoconf libtool pkg-config clang libc++-dev \
94-
iproute2 clang net-tools git python3-six
93+
apt-get install -y build-essential autoconf libtool pkg-config clang \
94+
libc++-dev iproute2 net-tools git python3-six
9595
9696
- name: Confirm IPv4 and IPv6 support
9797
run: |
@@ -129,6 +129,9 @@ jobs:
129129
- name: Run grpc tests with wolfProvider
130130
working-directory: ./grpc
131131
run: |
132+
# Verify wolfProvider is properly installed
133+
. $GITHUB_WORKSPACE/scripts/verify-debian.sh
134+
132135
# Start the port server
133136
./tools/run_tests/start_port_server.py
134137

‎.github/workflows/iperf.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ jobs:
8383
- name: Install dependencies
8484
run: |
8585
apt-get update
86-
apt-get install -y build-essential autoconf libtool pkg-config clang libc++-dev
86+
apt-get install -y build-essential autoconf libtool pkg-config clang \
87+
libc++-dev
8788
8889
- name: Checkout iperf
8990
uses: actions/checkout@v4
@@ -117,6 +118,8 @@ jobs:
117118
- name: Run tests
118119
working-directory: iperf
119120
run: |
121+
# Verify wolfProvider is properly installed
122+
. $GITHUB_WORKSPACE/scripts/verify-debian.sh
120123
export ${{ matrix.force_fail }}
121124
122125
# Test variables for iperf

‎.github/workflows/ipmitool.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ jobs:
9797
- name: Confirm built with OpenSSL and test with wolfProvider
9898
working-directory: ipmitool
9999
run: |
100+
# Verify wolfProvider is properly installed
101+
. $GITHUB_WORKSPACE/scripts/verify-debian.sh
102+
100103
# Verify ipmitool was built and linked correctly with OpenSSL
101104
ldd src/ipmitool | grep -E '(libssl|libcrypto)'
102105
ldd src/ipmievd | grep -E '(libssl|libcrypto)'

‎.github/workflows/krb5.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ jobs:
112112
working-directory: krb5
113113
shell: bash
114114
run: |
115+
# Verify wolfProvider is properly installed
116+
source $GITHUB_WORKSPACE/scripts/verify-debian.sh
117+
115118
set +o pipefail # ignore errors from make check
116119
# Build KRB5
117120
cd src
@@ -132,4 +135,3 @@ jobs:
132135
make check 2>&1 | tee krb5-test.log
133136
TEST_RESULT=${PIPESTATUS[0]}
134137
$GITHUB_WORKSPACE/.github/scripts/check-workflow-result.sh $TEST_RESULT ${{ matrix.force_fail }} krb5
135-

‎.github/workflows/libcryptsetup.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ jobs:
131131
- name: Run cryptsetup tests
132132
working-directory: cryptsetup
133133
run: |
134+
# Verify wolfProvider is properly installed
135+
. $GITHUB_WORKSPACE/scripts/verify-debian.sh
134136
export ${{ matrix.force_fail }}
135137
136138
# from the cryptsetup source root

0 commit comments

Comments
 (0)