Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/chrony.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,5 @@ jobs:
working-directory: chrony
run: |
export LD_LIBRARY_PATH=/opt/gnutls/lib:/opt/wolfssl/lib:/opt/wolfssl-gnutls-wrapper/lib
export WGW_LOGGING=1
make check
2 changes: 1 addition & 1 deletion .github/workflows/curl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ jobs:
working-directory: curl
run: |
export USER=root
WGW_LOGGING=0 make -j $(nproc) test-ci
make -j $(nproc) test-ci
1 change: 1 addition & 0 deletions .github/workflows/dirmngr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,6 @@ jobs:
-Wl,-rpath,$PREFIX_LOCAL/lib -Wl,-rpath,$PREFIX_GNUTLS/lib"

export LD_LIBRARY_PATH=/usr/local/lib:/opt/gnutls/lib
export WGW_LOGGING=1
cd gnupg/dirmngr
make check
3 changes: 2 additions & 1 deletion .github/workflows/fwupd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
git checkout ${{ matrix.fwupd_ref }}

- name: Patch fwupd tests for Debian Bookworm compatibility
if: matrix.fwupd_ref != '1.9.26'
if: matrix.fwupd_ref != '1.9.26' matrix.fwupd_ref != 'master'
working-directory: fwupd
run: |
# GLib in Debian Bookworm emits WARNING for invalid properties while
Expand All @@ -125,5 +125,6 @@ jobs:
- name: Test fwupd
working-directory: fwupd
run: |
export WGW_LOGGING=1
meson test -C builddir --print-errorlogs

1 change: 1 addition & 0 deletions .github/workflows/glib-networking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ jobs:
# Run all tests, 'meson test', when they are working
# mock PKCS#11 is failing with GnuTLS
run: |
export WGW_LOGGING=1
cd build
if [ ${{ matrix.glib-networking_ref }} = '2.74.0' ]; then
meson test gnome file-database-gnutls environment certificate-gnutls
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/gst-libav1.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
gst_ref: [ 'master', 'debian/1.26.2-1', 'debian/1.26.3-1' ]
gst_ref: [ 'debian/1.26.2-1', 'debian/1.26.3-1' ]
fail-fast: false
steps:
- name: Checkout gnutls-wolfssl repository
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Build FFmpeg with GnuTLS & MPEG-4 encoder
run: |
cd $RUNNER_WORKSPACE
git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg-gnutls
git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg-gnutls
cd ffmpeg-gnutls
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/gstreamer/lib/pkgconfig"
export CPPFLAGS="-I/opt/gnutls/include -I/opt/gstreamer/include"
Expand Down Expand Up @@ -180,4 +180,5 @@ jobs:
export LDFLAGS="-L/opt/gnutls/lib -L/opt/ffmpeg-gnutls/lib -L/opt/gstreamer/lib \
-Wl,-rpath,/opt/gnutls/lib -Wl,-rpath=/opt/ffmpeg-gnutls/lib -Wl,-rpath,/opt/gstreamer/lib $LDFLAGS"
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/ffmpeg-gnutls/lib:/opt/gstreamer/lib:$LD_LIBRARY_PATH"
export WGW_LOGGING=1
meson test -C build --print-errorlogs
1 change: 1 addition & 0 deletions .github/workflows/libcamera.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
- name: Run unit-tests that don’t need hardware
working-directory: libcamera/build
run: |
export WGW_LOGGING=1
if [ "${{ matrix.libcamera_ref }}" = "v0.0.3" ]; then
meson test -v \
'control_info' 'control_value' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/libcups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:

# Run tests WITH provider
echo "=== RUNNING TESTS WITH PROVIDER ==="
export WGW_LOGGING=0


> /tmp/with_provider.log

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/libjcat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,5 @@ jobs:
working-directory: libjcat
run: |
. ~/.venvs/meson-056/bin/activate
export WGW_LOGGING=1
meson test -C _build-custom --verbose
1 change: 1 addition & 0 deletions .github/workflows/libnice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,5 @@ jobs:
export CPPFLAGS="-I/opt/gnutls/include ${CPPFLAGS}"
export LDFLAGS="-L/opt/gnutls/lib -Wl,-rpath,/opt/gnutls/lib ${LDFLAGS}"
export LD_LIBRARY_PATH="/opt/gnutls/lib:${LD_LIBRARY_PATH}"
export WGW_LOGGING=1
ninja -C build-gnutls test
1 change: 1 addition & 0 deletions .github/workflows/libvnc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,6 @@ jobs:
export CPPFLAGS="-I/opt/gnutls/include $CPPFLAGS"
export LDFLAGS="-L/opt/gnutls/lib -Wl,-rpath,/opt/gnutls/lib $LDFLAGS"
export LD_LIBRARY_PATH="/opt/gnutls/lib:$LD_LIBRARY_PATH"
export WGW_LOGGING=1
cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll test/
ctest -C Debug --output-on-failure
12 changes: 7 additions & 5 deletions .github/workflows/libvte.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
vte_ref: [ 'master', '0.70.6']
vte_ref: [ '0.70.6' ]
fail-fast: false
runs-on: ${{ matrix.os }}
container:
Expand Down Expand Up @@ -92,14 +92,16 @@ jobs:
- name: Verify VTE is linked against the custom GnuTLS
working-directory: vte/_build
run: |
lib=$(find src -maxdepth 1 -name 'libvte-2.91*.so*' | head -n 1)
lib=$(find src -maxdepth 1 -type f -name 'libvte-2.91*.so*' | head -n 1)
echo "Checking linkage for $lib"
ldd "$lib" | grep gnutls
if ! ldd "$lib" | grep -q '/opt/gnutls/lib/libgnutls.so'; then
echo "::error::VTE is NOT linked against /opt/gnutls/lib/libgnutls.so"
exit 1
echo "::error::VTE is NOT linked against /opt/gnutls/lib/libgnutls.so"
exit 1
fi

- name: Test VTE build
working-directory: vte
run: ninja -C _build test --verbose
run: |
export WGW_LOGGING=1
ninja -C _build test --verbose
1 change: 1 addition & 0 deletions .github/workflows/networkmanager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ jobs:
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export NM_TEST_REGENERATE=1
export WGW_LOGGING=1

if [ "${{ matrix.nm_version }}" != "1.42.4" ]; then
ninja -C build-gnutls test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openldap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,4 @@ jobs:
- name: Test OpenLDAP
working-directory: openldap
run: |
WGW_LOGGING=0 make test
make test
2 changes: 1 addition & 1 deletion .github/workflows/qpdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,5 @@ jobs:
working-directory: qpdf
run: |
cd build
WGW_LOGGING=0 ctest --verbose
ctest --verbose

2 changes: 2 additions & 0 deletions .github/workflows/rsyslog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
sudo apt-get install -y build-essential pkg-config libestr-dev libfastjson-dev zlib1g-dev uuid-dev libhiredis-dev uuid-dev flex bison
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
sudo apt-get install -y libcurl4-gnutls-dev
sudo apt-get install -y protobuf-c-compiler libprotobuf-c-dev libsnappy-dev
apt-get install -y python3-pip
pip3 install --break-system-packages docutils

Expand Down Expand Up @@ -172,6 +173,7 @@ jobs:
EOF
export VALGRIND_OPTS=--suppressions=valgrind.supp
export LD_LIBRARY_PATH=/opt/gnutls/lib:/opt/wolfssl/lib:/opt/wolfssl-gnutls-wrapper/lib
export WGW_LOGGING=1
make check 2>&1 | tee test.log
awk '/^FAIL:/ {gsub(/\.sh$/, ".log", $2); print "==== " $2 " ===="; system("cat tests/" $2 "\n")}' test.log
echo "Check for failures"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/samba-libs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,5 @@ jobs:
export CPPFLAGS="-I/opt/gnutls/include ${CPPFLAGS:-}"
export LDFLAGS="-L/opt/gnutls/lib -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/opt/gnutls/lib ${LDFLAGS:-}"
export LD_LIBRARY_PATH="/opt/gnutls/lib:/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH:-}"
export WGW_LOGGING=1
make quicktest -j"$(nproc)"
2 changes: 2 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:

- name: Run unit tests
run: |
export WGW_LOGGING=1
TEST_RESULT=0
cd wolfssl-gnutls-wrapper
${{ matrix.provider }} make test || TEST_RESULT=$?
Expand Down Expand Up @@ -103,6 +104,7 @@ jobs:

- name: Run Valgrind tests
run: |
export WGW_LOGGING=1
cd wolfssl-gnutls-wrapper/tests/
make run_valgrind

1 change: 1 addition & 0 deletions .github/workflows/wget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,6 @@ jobs:
if [[ "${{ matrix.wget_ref }}" = "v1.21.4" ]]; then
export LD_LIBRARY_PATH=/opt/nettle/lib64:/opt/nettle/lib:/opt/gnutls/lib:/opt/wolfssl/lib:/opt/wolfssl-gnutls-wrapper/lib:$LD_LIBRARY_PATH
fi
export WGW_LOGGING=1
make check
find . -name '*.log' | xargs grep wgw
1 change: 1 addition & 0 deletions .github/workflows/wireshark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ jobs:
run: |
export PKG_CONFIG_PATH=/opt/nettle/lib64/pkgconfig:/opt/nettle/lib/pkgconfig:/opt/gnutls/lib/pkgconfig:$PKG_CONFIG_PATH
export LD_LIBRARY_PATH=/opt/nettle/lib64:/opt/nettle/lib:/opt/gnutls/lib:$LD_LIBRARY_PATH
export WGW_LOGGING=1
cd build
pytest ../test/suite_decryption.py -v -s
pytest ../test/suite_dissection.py -v -s
1 change: 1 addition & 0 deletions .github/workflows/xmlsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,6 @@ jobs:
export XMLSEC_TEST_IGNORE_PERCENT_SUCCESS=1
fi

export WGW_LOGGING=1
make check
find /tmp -name "*.log" | xargs grep wgw
4 changes: 2 additions & 2 deletions wolfssl-gnutls-wrapper/src/wolfssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ int _gnutls_wolfssl_init(void)
int ret;
char* str;

/* Set logging to be enabled. */
loggingEnabled = 1;
/* Set logging to be disabled by default. */
loggingEnabled = 0;
/* Set default logging file descriptor. */
loggingFd = stderr;
#if defined(XGETENV) && !defined(NO_GETENV)
Expand Down
Loading