Skip to content

Commit 4abb831

Browse files
gasbytesgasbytes
committed
- Updated README.md;
- Added missing dependencies; - Reworked tpm2-tools to point to the new dir /opt/curl instead of /usr/local
1 parent 806f932 commit 4abb831

3 files changed

Lines changed: 129 additions & 39 deletions

File tree

‎.github/workflows/networkmanager.yml‎

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
sudo apt-get install --yes --no-install-recommends \
3434
autoconf automake libtool m4 pkg-config build-essential git \
3535
meson ninja-build gettext clang gperf gnulib autopoint gtk-doc-tools \
36-
nettle-dev libtasn1-bin libtasn1-6-dev libunistring-dev \
36+
nettle-dev libtasn1-bin libtasn1-6-dev libunistring-dev libnvme-dev \
3737
libp11-kit-dev libunbound-dev bison python3-yaml \
3838
debhelper debugedit dh-autoreconf dh-strip-nondeterminism dwz intltool \
39-
libbluetooth-dev libcurl4-gnutls-dev libdebhelper-perl \
40-
libfile-stripnondeterminism-perl libglib2.0-doc libgnutls28-dev \
41-
libnewt-dev libnl-3-dev libnl-cli-3-200 libnl-nf-3-200 libnvme-dev \
42-
libpolkit-agent-1-dev libslang2-dev libsub-override-perl \
43-
libteam-dev libteam5 libyaml-perl po-debconf
39+
libbluetooth-dev libdebhelper-perl libndp-dev \
40+
libfile-stripnondeterminism-perl libglib2.0-doc \
41+
libnewt-dev libnl-3-dev libnl-cli-3-200 libnl-nf-3-200 libgirepository1.0-dev \
42+
libpolkit-agent-1-dev libslang2-dev libsub-override-perl libdbus-1-dev ppp ppp-dev mobile-broadband-provider-info \
43+
libteam-dev libteam5 libyaml-perl po-debconf libaudit-dev libudev-dev libsystemd-dev libmm-glib-dev libjansson-dev dhcpcd5 dnsmasq-base libpsl-dev libreadline-dev valac
4444
4545
- name: Build forked GnuTLS stack
4646
run: |
@@ -52,7 +52,7 @@ jobs:
5252
git clone --branch curl-7_88_1 https://github.com/curl/curl
5353
cd curl
5454
autoreconf -fi
55-
./configure --with-gnutls=/opt/gnutls --prefix=/usr/local \
55+
./configure --with-gnutls=/opt/gnutls --prefix=/opt/curl \
5656
--disable-static --enable-shared
5757
make -j"$(nproc)"
5858
sudo make install
@@ -69,17 +69,28 @@ jobs:
6969
- name: Configure & build NetworkManager
7070
working-directory: NetworkManager
7171
run: |
72-
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
73-
export CPPFLAGS="-I/opt/gnutls/include -I/usr/local/include $CPPFLAGS"
74-
export LDFLAGS="-L/opt/gnutls/lib -L/usr/local/lib -Wl,-rpath,/opt/gnutls/lib:/usr/local/lib $LDFLAGS"
75-
export LD_LIBRARY_PATH="/opt/gnutls/lib:/usr/local/lib:$LD_LIBRARY_PATH"
72+
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/curl/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
73+
export CPPFLAGS="-I/opt/gnutls/include -I/opt/curl/include${CPPFLAGS:+ $CPPFLAGS}"
74+
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
75+
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
76+
77+
if [ "${{ matrix.nm_version }}" != "master" ]; then
78+
meson setup build-gnutls \
79+
-Dcrypto=gnutls \
80+
-Dtests=yes \
81+
-Dsystemd_journal=true \
82+
-Dmore_logging=true \
83+
-Dqt=false
84+
else
85+
meson setup build-gnutls \
86+
-Dcrypto=gnutls \
87+
-Dtests=yes \
88+
-Dsystemd_journal=true \
89+
-Dmore_logging=true \
90+
-Dqt=false \
91+
-Dnbft=false
92+
fi
7693
77-
meson setup build-gnutls \
78-
-Dcrypto=gnutls \
79-
-Dtests=yes \
80-
-Dsystemd_journal=true \
81-
-Dmore_logging=true \
82-
-Dqt=false
8394
ninja -C build-gnutls -j"$(nproc)"
8495
8596
# ───────────────────── verify linkage (before tests) ────────────────────
@@ -99,13 +110,21 @@ jobs:
99110
- name: Run NetworkManager tests
100111
working-directory: NetworkManager
101112
run: |
102-
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
103-
export CPPFLAGS="-I/opt/gnutls/include -I/usr/local/include $CPPFLAGS"
104-
export LDFLAGS="-L/opt/gnutls/lib -L/usr/local/lib -Wl,-rpath,/opt/gnutls/lib:/usr/local/lib $LDFLAGS"
105-
export LD_LIBRARY_PATH="/opt/gnutls/lib:/usr/local/lib:$LD_LIBRARY_PATH"
113+
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/curl/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
114+
export CPPFLAGS="-I/opt/gnutls/include -I/opt/curl/include${CPPFLAGS:+ $CPPFLAGS}"
115+
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
116+
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
117+
export NM_TEST_REGENERATE=1
106118
107-
if [ "${{ matrix.nm_version }}" = "1.42.4" ]; then
108-
ninja -C build-gnutls meson-test -- --skip platform/test-link-linux --skip config/test-config
109-
else
119+
if [ "${{ matrix.nm_version }}" != "1.42.4" ]; then
110120
ninja -C build-gnutls test
121+
else
122+
# Skipped on CI because the GitHub Actions kernel lacks the VRF/Team modules and QoS-mapping support that platform/test-link-linux expects, so the test aborts with “Unknown device type / xgress QoS mapping assertion.
123+
# Doesn't test any TLS/Crypto capabilities.
124+
cd build-gnutls
125+
all_tests=$(meson test --list 2>/dev/null)
126+
test_list=$(printf '%s\n' "$all_tests" \
127+
| grep -v -E '^(platform/test-link-linux)$' \
128+
| tr '\n' ' ')
129+
meson test $test_list --print-errorlogs
111130
fi

‎.github/workflows/tpm2-tools.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
git clone --branch curl-8_4_0 https://github.com/curl/curl
6565
cd curl
6666
autoreconf -fi
67-
./configure --with-gnutls=/opt/gnutls --prefix=/usr/local
67+
./configure --with-gnutls=/opt/gnutls --prefix=/opt/curl
6868
make
6969
sudo make install
7070
sudo ldconfig
@@ -76,9 +76,10 @@ jobs:
7676
cd tpm2-tss
7777
git submodule update --init --recursive
7878
./bootstrap
79-
export PKG_CONFIG_PATH=/opt/gnutls/lib/pkgconfig:$PKG_CONFIG_PATH
80-
export CPPFLAGS="-I/opt/gnutls/include $CPPFLAGS"
81-
export LDFLAGS="-L/opt/gnutls/lib -Wl,-rpath,/opt/gnutls/lib $LDFLAGS"
79+
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/curl/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
80+
export CPPFLAGS="-I/opt/gnutls/include -I/opt/curl/include${CPPFLAGS:+ $CPPFLAGS}"
81+
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
82+
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
8283
./configure --prefix=/usr/local --disable-hardening
8384
make
8485
sudo make install
@@ -90,9 +91,10 @@ jobs:
9091
git clone https://github.com/tpm2-software/tpm2-abrmd
9192
cd tpm2-abrmd
9293
./bootstrap
93-
export PKG_CONFIG_PATH=/opt/gnutls/lib/pkgconfig:$PKG_CONFIG_PATH
94-
export CPPFLAGS="-I/opt/gnutls/include $CPPFLAGS"
95-
export LDFLAGS="-L/opt/gnutls/lib -Wl,-rpath,/opt/gnutls/lib $LDFLAGS"
94+
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/curl/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
95+
export CPPFLAGS="-I/opt/gnutls/include -I/opt/curl/include${CPPFLAGS:+ $CPPFLAGS}"
96+
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
97+
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
9698
./configure --prefix=/usr/local \
9799
--with-dbuspolicydir=/etc/dbus-1/system.d \
98100
--with-systemdsystemunitdir=/lib/systemd/system
@@ -122,9 +124,10 @@ jobs:
122124
fi
123125
124126
./bootstrap
125-
export PKG_CONFIG_PATH=/opt/gnutls/lib/pkgconfig:$PKG_CONFIG_PATH
126-
export CPPFLAGS="-I/opt/gnutls/include $CPPFLAGS"
127-
export LDFLAGS="-L/opt/gnutls/lib -Wl,-rpath,/opt/gnutls/lib $LDFLAGS"
127+
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/curl/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
128+
export CPPFLAGS="-I/opt/gnutls/include -I/opt/curl/include${CPPFLAGS:+ $CPPFLAGS}"
129+
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
130+
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
128131
./configure --prefix=/usr/local --enable-unit=abrmd
129132
make
130133
sudo make install
@@ -136,17 +139,18 @@ jobs:
136139
echo "::group::ldd $bin"
137140
ldd "$bin" | grep -E "lib(curl|gnutls)"
138141
echo "::endgroup::"
139-
ldd "$bin" | grep -q "libcurl.so.4 => /usr/local/lib/libcurl.so.4" &&
142+
ldd "$bin" | grep -q "libcurl.so.4 => /opt/curl/lib/libcurl.so.4" &&
140143
ldd "$bin" | grep -q "libgnutls.so.30 => /opt/gnutls/lib/libgnutls.so.30" ||
141144
{ echo "❌ Wrong linkage detected in $bin"; exit 1; }
142145
done
143146
144147
- name: Run complete test-suite
145148
run: |
146149
cd tpm2-tools
147-
export PKG_CONFIG_PATH=/opt/gnutls/lib/pkgconfig:$PKG_CONFIG_PATH
148-
export CPPFLAGS="-I/opt/gnutls/include $CPPFLAGS"
149-
export LDFLAGS="-L/opt/gnutls/lib -Wl,-rpath,/opt/gnutls/lib $LDFLAGS"
150+
export PKG_CONFIG_PATH="/opt/gnutls/lib/pkgconfig:/opt/curl/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
151+
export CPPFLAGS="-I/opt/gnutls/include -I/opt/curl/include${CPPFLAGS:+ $CPPFLAGS}"
152+
export LDFLAGS="-L/opt/gnutls/lib -L/opt/curl/lib -Wl,-rpath,/opt/gnutls/lib:/opt/curl/lib${LDFLAGS:+ $LDFLAGS}"
153+
export LD_LIBRARY_PATH="/opt/gnutls/lib:/opt/curl/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
150154
export GNUTLS_DEBUG_LEVEL=5
151155
export WGW_LOGGING=1
152156
export TEST_REGENERATE_OUTPUT=1

‎README.md‎

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
11
# gnutls-wolfssl
22

3-
Experimental port of wolfSSL into gnutls
3+
Experimental port of wolfSSL into GnuTLS. One script builds everything and drops the bits under /opt.
4+
5+
## Quick start
6+
```
7+
git clone https://github.com/YOURORG/gnutls-wolfssl.git
8+
cd gnutls-wolfssl
9+
# regular build
10+
./setup.sh
11+
12+
# build with FIPS 140 support
13+
./setup.sh fips
14+
```
15+
On success you get:
16+
```
17+
/opt/wolfssl wolfSSL
18+
/opt/gnutls GnuTLS built on wolfSSL
19+
/opt/wolfssl-gnutls-wrapper runtime shim
20+
```
21+
If the loader can’t find the libs, add the path to LD_LIBRARY_PATH (Linux) or DYLD_LIBRARY_PATH (macOS).
22+
23+
## Environment variables
24+
| var | default | note |
25+
|-----|---------|------|
26+
| WOLFSSL_INSTALL | /opt/wolfssl | install prefix |
27+
| GNUTLS_INSTALL | /opt/gnutls | install prefix |
28+
| GNUTLS_FORCE_FIPS_MODE | – | set at runtime to enforce FIPS |
29+
30+
## Directory layout (after setup.sh has been run)
31+
```
32+
setup.sh do‑it‑all build script
33+
rebuild-gnutls.sh rebuild GnuTLS only
34+
wolfssl/ upstream clone
35+
gnutls/ upstream clone + branch gnutls-wolfssl
36+
wolfssl-gnutls-wrapper/ thin shim + tests
37+
```
38+
39+
## Tests
40+
```
41+
cd wolfssl-gnutls-wrapper
42+
43+
# build wrapper
44+
make
45+
46+
# full suite
47+
make test
48+
49+
# fast run of the test suite
50+
make test_fast
51+
52+
# test fips (only if ./setup.sh was run in fips mode)
53+
make test_fips
54+
```
55+
Each test prints ✔️/❌ and a summary.
56+
57+
## Using in your project
58+
```
59+
cc app.c \
60+
-I/opt/gnutls/include -I/opt/wolfssl/include \
61+
-L/opt/gnutls/lib -lgnutls \
62+
-L/opt/wolfssl/lib -lwolfssl \
63+
-L/opt/wolfssl-gnutls-wrapper/lib -lgnutls-wolfssl-wrapper
64+
```
65+
Make sure the wrapper comes after gnutls on the linker line.
66+
67+
## Clean up
68+
```
69+
sudo rm -rf /opt/wolfssl /opt/gnutls /opt/wolfssl-gnutls-wrapper
70+
```

0 commit comments

Comments
 (0)