Skip to content

Commit b847897

Browse files
committed
Update fips mode from v5 to v5.2.4 and some other minor changes
- Update fips mode from v5 to v5.2.4. - Add autoconf-archive (now needed for correctly test rsyslog master branch) - drop 'main' from test matrix in qpdf.yml - qpdf's main rewrote the completion test into a pty-based interactive-shell test that's flaky in our bookworm container and unrelated to the wolfssl/gnutls provider. Main is just an extra branch that we decided to test along the latest and the target version, so it can be safely removed. - pin ffmpeg to n8.1 in the gst-libav workflows
1 parent 81679dd commit b847897

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/gst-libav1.0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
cd $RUNNER_WORKSPACE
111111
git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg-gnutls
112112
cd ffmpeg-gnutls
113+
git checkout n8.1
113114
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/gstreamer/lib/pkgconfig"
114115
export CPPFLAGS="-I/opt/gnutls/include -I/opt/gstreamer/include"
115116
export LDFLAGS="-L/opt/gnutls/lib -L/opt/gstreamer/lib -Wl,-rpath,/opt/gnutls/lib -Wl,-rpath,/opt/gstreamer/lib"

.github/workflows/qpdf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ ubuntu-latest ]
22-
qpdf_ref: [ 'main', 'v11.3.0', 'v12.2.0' ]
22+
qpdf_ref: [ 'v11.3.0', 'v12.2.0' ]
2323
fail-fast: false
2424
runs-on: ${{ matrix.os }}
2525
container:

.github/workflows/rsyslog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
if: matrix.os == 'ubuntu-latest'
4545
run: |
4646
sudo apt-get install -y build-essential pkg-config libestr-dev libfastjson-dev zlib1g-dev uuid-dev libhiredis-dev uuid-dev flex bison
47-
sudo apt-get install -y libdbi-dev libmariadb-dev-compat postgresql-client libpq-dev libnet-dev librdkafka-dev libpcre3-dev libtokyocabinet-dev libglib2.0-dev libmongo-client-dev
47+
sudo apt-get install -y libdbi-dev libmariadb-dev-compat postgresql-client libpq-dev libnet-dev librdkafka-dev libpcre3-dev libtokyocabinet-dev libglib2.0-dev libmongo-client-dev libyaml-dev
4848
sudo apt-get install -y libcurl4-gnutls-dev
4949
sudo apt-get install -y protobuf-c-compiler libprotobuf-c-dev libsnappy-dev
5050
apt-get install -y python3-pip
@@ -53,7 +53,7 @@ jobs:
5353
- name: Install build and test dependencies (Ubuntu only)
5454
if: matrix.os == 'ubuntu-latest'
5555
run: |
56-
sudo apt-get install -y autoconf libtool valgrind
56+
sudo apt-get install -y autoconf autoconf-archive libtool valgrind
5757
5858
# Restore (and later save) the compiled tool-chain if it already exists
5959
- name: Restore cached gnutls-wolfssl

setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ if [ $FIPS_MODE -eq 1 ]; then
206206
cd fips-v5-checkout
207207
fi
208208

209-
./configure --prefix=$WOLFSSL_INSTALL/ CC=clang --enable-cmac --enable-aesccm --enable-keygen 'CFLAGS=-DWOLFSSL_PUBLIC_ASN -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DWOLFSSL_PUBLIC_MP -DWOLFSSL_RSA_KEY_CHECK -DNO_MD5' --enable-fips=v5
209+
./configure --prefix=$WOLFSSL_INSTALL/ CC=clang --enable-cmac --enable-aesccm --enable-keygen 'CFLAGS=-DWOLFSSL_PUBLIC_ASN -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DWOLFSSL_PUBLIC_MP -DWOLFSSL_RSA_KEY_CHECK -DNO_MD5' --enable-fips=v5.2.4
210210

211211
make
212212

0 commit comments

Comments
 (0)