Skip to content

Commit 0142475

Browse files
padelsbachpadelsbach
committed
Updates after rebase
1 parent 1325dbc commit 0142475

File tree

6 files changed

+81
-57
lines changed

6 files changed

+81
-57
lines changed

‎.github/packages/debian-wolfssl.tar.gz‎

28.4 MB
Binary file not shown.

‎.github/workflows/bind9.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
pkg-config make libidn2-dev libuv1-dev libnghttp2-dev libcap-dev \
8989
libjemalloc-dev zlib1g-dev libxml2-dev libjson-c-dev libcmocka-dev \
9090
python3-pytest python3-dnspython python3-hypothesis patch iproute2 \
91-
net-tools
91+
net-tools git
9292
PERL_MM_USE_DEFAULT=1 cpan -i Net::DNS
9393
9494
- name: Checkout bind9

‎.github/workflows/build-wolfprovider.yml‎

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -98,61 +98,43 @@ jobs:
9898
git remote add upstream https://github.com/wolfSSL/wolfProvider.git || true
9999
git fetch upstream --tags --no-recurse-submodules
100100
101-
# Cache wolfSSL to speed up builds:
102-
# - Git repository cache: Avoids re-cloning wolfSSL repo
103-
# - Complete build cache: Includes source, built packages, and artifacts
104-
# Cache keys include script hash to invalidate when install script changes
105-
- name: Cache wolfSSL git repository
106-
uses: actions/cache@v4
107-
with:
108-
path: /tmp/wolfssl-pkg/wolfssl/.git
109-
key: wolfssl-git-${{ env.wolfssl_ref }}-${{ hashFiles('wolfProvider/debian/install-wolfssl.sh') }}-${{ github.sha }}
110-
restore-keys: |
111-
wolfssl-git-${{ env.wolfssl_ref }}-${{ hashFiles('wolfProvider/debian/install-wolfssl.sh') }}-
112-
wolfssl-git-${{ env.wolfssl_ref }}-
113-
114-
- name: Cache wolfSSL source and build
115-
uses: actions/cache@v4
116-
with:
117-
path: |
118-
${{ env.WOLFSSL_PACKAGES_PATH }}/wolfssl
119-
${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb
120-
${{ env.WOLFSSL_PACKAGES_PATH }}/*.dsc
121-
${{ env.WOLFSSL_PACKAGES_PATH }}/*.tar.gz
122-
key: wolfssl-complete-${{ env.wolfssl_ref }}-${{ hashFiles('wolfProvider/debian/install-wolfssl.sh') }}-${{ github.sha }}
123-
restore-keys: |
124-
wolfssl-complete-${{ env.wolfssl_ref }}-${{ hashFiles('wolfProvider/debian/install-wolfssl.sh') }}-
101+
# - name: Restore wolfSSL packages
102+
# uses: actions/cache@v4
103+
# id: wolfssl_cache
104+
# with:
105+
# path: |
106+
# ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb
107+
# ${{ env.WOLFSSL_PACKAGES_PATH }}/*.dsc
108+
# ${{ env.WOLFSSL_PACKAGES_PATH }}/*.tar.gz
109+
# key: wolfssl-debian-packages-${{ inputs.wolfssl_ref }}
110+
111+
# - name: Install wolfSSL packages from cache
112+
# if: steps.wolfssl_cache.outputs.cache-hit == 'true'
113+
# run: |
114+
# printf "Installing wolfSSL packages from cache:\n"
115+
# ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
116+
# apt install --reinstall -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*wolfssl*.deb
117+
118+
# TODO: roll this step into utils-wolfssl.sh
119+
# TODO: specify tag below
120+
- name: Build wolfSSL packages and install
121+
# if: steps.wolfssl_cache.outputs.cache-hit != 'true'
122+
run: |
123+
# $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }}
124+
$GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }}
125+
126+
# # Unpack and install wolfSSL packages
127+
# - name: Unpack and install wolfSSL packages
128+
# run: |
129+
# mkdir -p ${{ env.WOLFSSL_PACKAGES_PATH }}
130+
# tar -xzf .github/packages/debian-wolfssl.tar.gz -C ${{ env.WOLFSSL_PACKAGES_PATH }}
131+
# mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }}
132+
# apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb
125133

126-
- name: Install wolfssl debian package
127-
run: |
128-
mkdir -p "/tmp/wolfssl-pkg"
129-
cd "/tmp/wolfssl-pkg"
130-
131-
# Check if cached packages exist
132-
if ls *.deb 1> /dev/null 2>&1; then
133-
echo "Found cached wolfSSL packages, installing them..."
134-
dpkg -i *.deb || apt-get install -f -y
135-
else
136-
echo "No cached packages found, building from source..."
137-
# Install wolfssl packages with specified version
138-
chmod +x $GITHUB_WORKSPACE/debian/install-wolfssl.sh
139-
if [ "$wolfssl_ref" != "master" ]; then
140-
$GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag "$WOLFSSL_VERSION" "/tmp/wolfssl-pkg"
141-
else
142-
$GITHUB_WORKSPACE/debian/install-wolfssl.sh "/tmp/wolfssl-pkg"
143-
fi
144-
fi
145-
146-
- name: Install wolfSSL packages from cache
147-
run: |
148-
printf "Installing wolfSSL packages:\n"
149-
ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
150-
apt install --reinstall -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*wolfssl*.deb
151-
152134
# Check for cached OpenSSL packages
153135
- name: Checking OpenSSL packages in cache
154136
uses: actions/cache@v4
155-
id: openssl-cache
137+
id: openssl_cache
156138
continue-on-error: true
157139
with:
158140
path: |
@@ -162,7 +144,7 @@ jobs:
162144

163145
# Install OpenSSL packages from cache if available
164146
- name: Install OpenSSL packages from cache
165-
if: steps.openssl-cache.outputs.cache-hit == 'true'
147+
if: steps.openssl_cache.outputs.cache-hit == 'true'
166148
run: |
167149
printf "Installing OpenSSL packages from cache:\n"
168150
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}

‎.github/workflows/cjose.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ 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+
9198
- name: Download cjose
9299
uses: actions/checkout@v4
93100
with:

‎debian/control‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ Build-Depends:
99
devscripts,
1010
dh-exec,
1111
git,
12-
pkgconf,
13-
libwolfssl-dev
12+
pkgconf
1413

1514
Package: libwolfprov
1615
Architecture: any

‎debian/install-wolfssl.sh‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,50 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac
130130

131131
# Configure with the specified options
132132
echo "Configuring wolfSSL with specified options..."
133-
configure_opts="--enable-opensslcoexist --enable-cmac --with-eccminsz=192 --enable-ed25519 --enable-ed448 --enable-md5 --enable-curve25519 --enable-curve448 --enable-aesccm --enable-aesxts --enable-aescfb --enable-keygen --enable-shake128 --enable-shake256 --enable-wolfprovider --enable-rsapss --enable-scrypt"
133+
configure_opts="--enable-opensslcoexist \
134+
--enable-cmac \
135+
--with-eccminsz=192 \
136+
--enable-ed25519 \
137+
--enable-ed448 \
138+
--enable-md5 \
139+
--enable-curve25519 \
140+
--enable-curve448 \
141+
--enable-aesccm \
142+
--enable-aesxts \
143+
--enable-aescfb \
144+
--enable-keygen \
145+
--enable-shake128 \
146+
--enable-shake256 \
147+
--enable-wolfprovider \
148+
--enable-rsapss \
149+
--enable-scrypt"
134150

135151
if [ "$debug_mode" = "true" ]; then
136152
configure_opts="$configure_opts --enable-debug"
137153
echo "Debug mode enabled"
138154
fi
139155

140-
./configure $configure_opts CFLAGS="-DWOLFSSL_OLD_OID_SUM -DWOLFSSL_PUBLIC_ASN -DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DWOLFSSL_PUBLIC_MP -DWOLFSSL_RSA_KEY_CHECK -DHAVE_FFDHE_Q -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DWOLFSSL_ECDSA_DETERMINISTIC_K -DWOLFSSL_VALIDATE_ECC_IMPORT -DRSA_MIN_SIZE=1024 -DHAVE_AES_ECB -DWC_RSA_DIRECT -DWC_RSA_NO_PADDING -DACVP_VECTOR_TESTING -DWOLFSSL_ECDSA_SET_K" LIBS="-lm"
156+
./configure $configure_opts \
157+
CFLAGS="-DWOLFSSL_OLD_OID_SUM \
158+
-DWOLFSSL_PUBLIC_ASN \
159+
-DHAVE_FFDHE_3072 \
160+
-DHAVE_FFDHE_4096 \
161+
-DWOLFSSL_DH_EXTRA \
162+
-DWOLFSSL_PSS_SALT_LEN_DISCOVER \
163+
-DWOLFSSL_PUBLIC_MP \
164+
-DWOLFSSL_RSA_KEY_CHECK \
165+
-DHAVE_FFDHE_Q \
166+
-DHAVE_FFDHE_6144 \
167+
-DHAVE_FFDHE_8192 \
168+
-DWOLFSSL_ECDSA_DETERMINISTIC_K \
169+
-DWOLFSSL_VALIDATE_ECC_IMPORT \
170+
-DRSA_MIN_SIZE=1024 \
171+
-DHAVE_AES_ECB \
172+
-DWC_RSA_DIRECT \
173+
-DWC_RSA_NO_PADDING \
174+
-DACVP_VECTOR_TESTING \
175+
-DWOLFSSL_ECDSA_SET_K" \
176+
LIBS="-lm"
141177

142178
# Build Debian packages
143179
echo "Building Debian packages..."

0 commit comments

Comments
 (0)