Skip to content

Commit c15f00d

Browse files
author
Test User
committed
Add correct docker options and patches
1 parent 2c2c1bd commit c15f00d

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.github/workflows/bind9.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ jobs:
117117
fetch-depth: 1
118118
- run: |
119119
cd bind9
120-
patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/bind9/bind9-${{ matrix.bind_ref }}-wolfprov.patch
120+
if [FIPS == "${{ matrix.fips_ref }}" ]; then
121+
patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/bind9/bind9-${{ matrix.bind_ref }}-wolfprov-fips.patch
122+
else
123+
patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/bind9/bind9-${{ matrix.bind_ref }}-wolfprov.patch
124+
fi
121125
122126
- name: Build and test bind9 with wolfProvider
123127
working-directory: bind9

.github/workflows/build-wolfprovider.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
image: ghcr.io/aidangarske/wolfprovider-build:bookworm
2727
env:
2828
DEBIAN_FRONTEND: noninteractive
29+
# Add network capabilities so ifconfig/RTNETLINK operations are permitted
30+
# These are passed to `docker run` as runtime options
31+
options: --cap-add=NET_ADMIN --cap-add=NET_RAW
2932
timeout-minutes: 20
3033
env:
3134
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages

.github/workflows/debian-package.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ jobs:
124124
# Uninstall the package
125125
apt-get remove -y libwolfprov
126126
127-
# Verify default OpenSSL provider is active
128-
$GITHUB_WORKSPACE/scripts/verify-install.sh --no-wp ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
127+
if openssl list -providers | grep -q "wolfSSL Provider"; then
128+
echo "wolfprovider is still listed as an OpenSSL provider"
129+
exit 1
130+
fi
129131
130132
# Purge the package to remove all files
131133
apt-get remove --purge -y libwolfprov

0 commit comments

Comments
 (0)