From: "cron2 (Code Review)" Date: Mon, 20 Apr 2026 17:31:48 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., yura.uddr@...277... Message-ID: <04bf960dc2fccdf797588c157be71d5469ae71cb-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="mWjSRGC4VdM="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: GHA: Factor out building SSL libs to a reusable workflow List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: uddr , plaisthos , openvpn-devel --mWjSRGC4VdM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16= 30?usp=3Demail ) Change subject: GHA: Factor out building SSL libs to a reusable workflow ...................................................................... GHA: Factor out building SSL libs to a reusable workflow We amassed a lot of code duplication there. Make it easier to track the differences between the libraries. Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8 Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630 Message-Id: <20260420160732.9492-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 686.html Signed-off-by: Gert Doering --- M .github/workflows/build.yaml A .github/workflows/test-ssllib.yml M renovate.json 3 files changed, 155 insertions(+), 313 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 365e72a..e4cb799 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -304,324 +304,49 @@ !${{ github.workspace }}/out/**/vcpkg_installed/** libressl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [libressl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=3Dno"] - include: - - build: asan - cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn= o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame= -pointer -g -O1" - ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s= sllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=3D1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=3Dsemver-coerced - LIBRESSL_REPO: libressl/portable - LIBRESSL_VERSION: v4.2.1 - LIBRESSL_INSTALL: /opt/libressl + ghrepo: libressl/portable + gitref: v4.2.1 + libconfigure: "LIBRESSL_GIT_OPTIONS=3D--no-single-branch ./autogen.s= h && ./configure --prefix=3D$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d= ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils = libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore libressl from cache - uses: actions/cache@...3010... - id: libressl-cache - with: - path: ${{ env.LIBRESSL_INSTALL }} - key: ${{ matrix.os }}-libressl-${{matrix.build }}-${{ env.LIBRES= SL_VERSION }} - - name: "libressl: checkout" - if: steps.libressl-cache.outputs.cache-hit !=3D 'true' - uses: actions/checkout@...2998... # v6.0.2 - with: - path: libressl - repository: ${{ env.LIBRESSL_REPO }} - ref: ${{ env.LIBRESSL_VERSION }} - - name: "libressl: autogen.sh" - if: steps.libressl-cache.outputs.cache-hit !=3D 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit !=3D 'true' - run: ./configure --prefix=3D${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit !=3D 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit !=3D 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/checkout@...2998... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS=3D"-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS=3D"-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto= " \ - LDFLAGS=3D"-Wl,-rpath=3D${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=3Dopenssl --enable-werror ${{m= atrix.configureflags}} - - name: make all - run: make -j3 - - name: Ensure the build uses LibreSSL - run: | - ./src/openvpn/openvpn --version - ./src/openvpn/openvpn --version | grep -q "library versions: Lib= reSSL" - - name: configure checks - run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=3D1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=3Dno"] - include: - - build: asan - cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn= o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame= -pointer -g -O1" - ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s= sllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=3D1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=3Dsemver-coerced - OPENSSL_REPO: openssl/openssl - OPENSSL_VERSION: openssl-4.0.0-beta1 - OPENSSL_INSTALL: /opt/openssl - - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d= ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils = libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore OpenSSL 4.0 from cache - uses: actions/cache@...3010... - id: openssl-cache - with: - path: ${{ env.OPENSSL_INSTALL }} - key: ${{ matrix.os }}-openssl-${{matrix.build }}-${{ env.OPENSSL= _VERSION }} - - name: "openssl: checkout" - if: steps.openssl-cache.outputs.cache-hit !=3D 'true' - uses: actions/checkout@...2998... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit !=3D 'true' - run: ./Configure --prefix=3D${{ env.OPENSSL_INSTALL }} --libdir= =3D${{ env.OPENSSL_INSTALL }}/lib --openssldir=3D${{ env.OPENSSL_INSTALL }}= -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit !=3D 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit !=3D 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/checkout@...2998... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS=3D"-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS=3D"-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto"= \ - LDFLAGS=3D"-Wl,-rpath=3D${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=3Dopenssl --enable-werror ${{m= atrix.configureflags}} - - name: make all - run: make -j3 - - name: Ensure the build uses Openssl - run: | - ./src/openvpn/openvpn --version - ./src/openvpn/openvpn --version | grep -q "library versions: Ope= nSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=3D1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=3D$LIBPREFIX --libdir=3D$LIBPREFI= X/lib --openssldir=3D$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn= o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame= -pointer -g -O1" - ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s= sllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=3D1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=3Dsemver-coerced - MBEDTLS_REPO: Mbed-TLS/mbedtls - MBEDTLS_VERSION: v4.0.0 - MBEDTLS_INSTALL: /opt/mbedtls4 - - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d= ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils = python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libc= ap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/cache@...3010... - id: mbedtls-cache - with: - path: ${{ env.MBEDTLS_INSTALL }} - key: ${{ matrix.os }}-mbedtls-${{matrix.build }}-${{ env.MBEDTLS= _VERSION }} - - name: "mbedtls: checkout" - if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true' - uses: actions/checkout@...2998... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/get-cmake@...2999... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=3D${{ env.MBEDTLS_INSTA= L }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/checkout@...2998... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=3Dmbedtls --enable-werror - - name: make all - run: make -j3 - - name: Ensure the build uses mbed TLS ${{ env.MBEDTLS_VERSION }} - run: | - ./src/openvpn/openvpn --version - ./src/openvpn/openvpn --version | grep -q "library versions: mbe= d TLS 4." - - name: configure checks - run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=3D1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=3D$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=3D$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn= o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame= -pointer -g -O1" - ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s= sllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=3D1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=3Dsemver-coerced - AWS_LC_REPO: aws/aws-lc - AWS_LC_VERSION: v1.70.0 - - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y gcc golang make liblzo= 2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev p= ython3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf= pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore AWS-LC from cache - uses: actions/cache@...3010... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_V= ERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit !=3D 'true' - uses: actions/checkout@...2998... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/get-cmake@...2999... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit !=3D 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=3DRelease -DCMAKE_INSTALL_PREFI= X=3D"${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=3D1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/checkout@...2998... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS=3D"-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS=3D"-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS=3D"-Wl,-rpath=3D${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=3Dopenssl - - name: make all - run: make -j3 - - name: Ensure the build uses AWS-LC - run: | - ./src/openvpn/openvpn --version - ./src/openvpn/openvpn --version | grep -q "library versions: AWS= -LC" - - name: configure checks - run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=3D1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=3DRelease -D= CMAKE_INSTALL_PREFIX=3D"$LIBPREFIX" -DBUILD_SHARED_LIBS=3D1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags: diff --git a/.github/workflows/test-ssllib.yml b/.github/workflows/test-ssl= lib.yml new file mode 100644 index 0000000..c6a2e44 --- /dev/null +++ b/.github/workflows/test-ssllib.yml @@ -0,0 +1,117 @@ +name: test_ssllib + +on: + workflow_call: + inputs: + libname: + required: true + type: string + ovpnlibname: + type: string + default: openssl + ovpnlibdesc: + required: true + type: string + ghrepo: + required: true + type: string + gitref: + required: true + type: string + libconfigure: + required: true + type: string + libmake: + type: string + default: "make -j3" + libinstall: + type: string + default: "sudo make install" + ovpnconfigureenv: + type: string + default: >- + OPENSSL_CFLAGS=3D"-I$LIBPREFIX/include" + OPENSSL_LIBS=3D"-L$LIBPREFIX/lib -lssl -lcrypto" + LDFLAGS=3D"-Wl,-rpath=3D$LIBPREFIX/lib" + ovpnconfigureflags: + type: string + default: --enable-werror --with-openssl-engine=3Dno + +jobs: + test_ssllib: + strategy: + fail-fast: false + matrix: + os: [ubuntu-24.04] + build: [normal, asan] + include: + - build: asan + cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn= o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame= -pointer -g -O1" + ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall + cc: clang + cxx: clang++ + - build: normal + cflags: "-O2 -g" + ldflags: "" + cc: gcc + cxx: g++ + + name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{inputs.l= ibname}}" + runs-on: ${{matrix.os}} + env: + CFLAGS: ${{matrix.cflags}} + LDFLAGS: ${{matrix.ldflags}} + CC: ${{matrix.cc}} + CXX: ${{matrix.cxx}} + UBSAN_OPTIONS: print_stacktrace=3D1 + LIBPREFIX: /opt/${{inputs.libname}} + + steps: + - name: Install dependencies + run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d= ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils = libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev + - name: Restore ${{inputs.libname}} from cache + uses: actions/cache@...3024... # v5.0.5 + id: ssllib-cache + with: + path: ${{env.LIBPREFIX}} + key: ${{matrix.os}}-${{inputs.libname}}-${{matrix.build }}-${{in= puts.gitref}} + - name: "${{inputs.libname}}: checkout" + if: steps.ssllib-cache.outputs.cache-hit !=3D 'true' + uses: actions/checkout@...2998... # v6.0.2 + with: + submodules: recursive + path: ${{inputs.libname}} + repository: ${{inputs.ghrepo}} + ref: ${{inputs.gitref}} + - name: "${{inputs.libname}}: configure" + if: steps.ssllib-cache.outputs.cache-hit !=3D 'true' + run: ${{inputs.libconfigure}} + working-directory: ${{inputs.libname}} + - name: "${{inputs.libname}}: build" + if: steps.ssllib-cache.outputs.cache-hit !=3D 'true' + run: ${{inputs.libmake}} + working-directory: ${{inputs.libname}} + - name: "${{inputs.libname}}: install" + if: steps.ssllib-cache.outputs.cache-hit !=3D 'true' + run: ${{inputs.libinstall}} + working-directory: ${{inputs.libname}} + - name: Run ldconfig + run: sudo ldconfig + - name: "OpenVPN: checkout" + uses: actions/checkout@...2998... # v6.0.2 + - name: "OpenVPN: autoreconf" + run: autoreconf -fvi + - name: "OpenVPN: configure" + run: | + ${{inputs.ovpnconfigureenv}} \ + ./configure --with-crypto-library=3D${{inputs.ovpnlibname}} ${{i= nputs.ovpnconfigureflags}} + - name: "OpenVPN: build" + run: make -j3 + - name: Ensure the build uses ${{inputs.libname}} + run: | + ./src/openvpn/openvpn --version + ./src/openvpn/openvpn --version | grep -q "library versions: ${{= inputs.ovpnlibdesc}}" + - name: "OpenVPN: configure checks" + run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc + - name: "OpenVPN: make check" + run: make -j3 check VERBOSE=3D1 diff --git a/renovate.json b/renovate.json index f9c62c4..809ac3f 100644 --- a/renovate.json +++ b/renovate.json @@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=3D(?.*?)\\n\\s*.*?_REPO:\\s*(?.*?)\\n\\s*.*?_VERSION:\\s*(?.*?)\\n" + "versioning=3D(?.*?)\\n\\s*ghrepo:\\s*(?.*?)\\n\\s*gitrepo:\\s*(?.*?)\\n" ], "datasourceTemplate": "github-tags" } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8 Gerrit-Change-Number: 1630 Gerrit-PatchSet: 4 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: uddr Gerrit-CC: openvpn-devel --mWjSRGC4VdM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

GHA: Factor out building SSL libs to a reusable =
workflow

We amassed a lot of code duplication there. Make
it easi= er to track the differences between the libraries.

Change-Id: I3d890= 16ccae297cfa596897c11a518f1ffbe3dc8
Signed-off-by: Frank Lichtenheld <= ;frank@...2641...>
Acked-by: Yuriy Darnobyt <yura.uddr@...277...&g= t;
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
Message-Id= : <20260420160732.9492-1-gert@...1296...>
URL: https://www.mail-ar= chive.com/openvpn-devel@lists.sourceforge.net/msg36686.html
Signed-off-b= y: Gert Doering <gert@...1296...>
---
M .github/workflows/build= .yaml
A .github/workflows/test-ssllib.yml
M renovate.json
3 files = changed, 155 insertions(+), 313 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml=

index 365e72a..e4cb799 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -304,324 +304,49 @@
!${{ git= hub.workspace }}/out/**/vcpkg_installed/**

libressl:

- str= ategy:
- fail-fast= : false
- matrix:<= /span>
- os: [ubuntu-24= .04]
- ssllib: [= libressl]
- buil= d: [ normal, asan ]
- = configureflags: ["--with-openssl-engine=3Dno"]
- include:

- - build: asan
- cflags: "-fsanitize= =3Daddress -fno-sanitize-recover=3Dall -fno-optimize-sibling-calls -fsanit= ize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
= - ldflags: -fsanitize= =3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- - build: normal
- cflags: "-O2 -g"
- ldflags: ""

- cc: gcc
-
- name: "${{matrix.cc}} ${{matrix.build}}= - ${{matrix.os}} - ${{matrix.ssllib}}"
- runs-on: ${{matrix.os}}
- env:
- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.ldflags }}- CC: ${{matrix.cc}}=
- UBSAN_OPTIONS: print_s= tacktrace=3D1
+ us= es: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: libressl
+ ovpnlibdesc: LibreSSL
# versioni= ng=3Dsemver-coerced
- = LIBRESSL_REPO: libressl/portable
- LIBRESSL_VERSION: v4.2.1
- LIBRESSL_INSTALL: /opt/libressl
+ ghrepo: libressl/portable
+ gitref: v4.2.1<= /span>
+ libconfigure: = "LIBRESSL_GIT_OPTIONS=3D--no-single-branch ./autogen.sh && ./c= onfigure --prefix=3D$LIBPREFIX"

- steps:
- - name: Install dependencies
- run: sudo apt update && = sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2= html clang libcmocka-dev python3-docutils libtool automake autoconf pkg-con= fig libcap-ng-dev libnl-genl-3-dev
- - name: Restore libressl from cache
- uses: actions/cache@...3010...

- id: libressl-cach= e
- with:=
- path: ${{ env.LIBR= ESSL_INSTALL }}
- = key: ${{ matrix.os }}-libressl-${{matrix.build }}-${{ env.LIBRESSL_VERS= ION }}
- - name: &= quot;libressl: checkout"
- if: steps.libressl-cache.outputs.cache-hit !=3D 'true&#= 39;
- uses: acti= ons/checkout@...2998... # v6.0.2
- with:
- repository: ${{ env.LIBRESSL_REPO }}
- ref: ${{ env.LIBRESSL_VERSION }}<= /span>
- - name: "li= bressl: autogen.sh"
- env:
= - LIBRESSL_GIT_OPTIONS: = "--no-single-branch"
- run: ./autogen.sh
- working-directory: libressl
- - name: "libressl: configure"
- if: steps.libres= sl-cache.outputs.cache-hit !=3D 'true'
- run: ./configure --prefix=3D${{ env.LIBRES= SL_INSTALL }}
- = working-directory: libressl
- - name: "libressl: make all"
- if: steps.libressl-cache.outputs.cache= -hit !=3D 'true'
- - name: "libressl: make install"- if: steps.libressl-cach= e.outputs.cache-hit !=3D 'true'
- run: sudo make install
- working-directory: libressl
- - name: "ldconfig"=

- run: sudo ldc= onfig
- - name: Ch= eckout OpenVPN
- = uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure
- run: |
- OPENSSL_CFLAGS=3D"-I${{ env.LIBRE= SSL_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.LIBRESSL_INSTALL }}/lib -= lssl -lcrypto" \
-= LDFLAGS=3D"-Wl,-rpath=3D${{ env.LIBRESSL_INSTALL }}/lib"= ; \
- ./config= ure --with-crypto-library=3Dopenssl --enable-werror ${{matrix.configureflag= s}}
- - name: make= all
- run: make= -j3
- - name: Ens= ure the build uses LibreSSL
- run: |
- = ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q &quo= t;library versions: LibreSSL"
- - name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"= ' >tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1
-
- openssl:
-= strategy:
- fa= il-fast: false
- m= atrix:
- os: [ub= untu-24.04]
- ss= llib: [openssl]
- = build: [ normal, asan ]
- configureflags: ["--with-openssl-engine=3Dno"]=
- include:
<= span style=3D"color: hsl(0, 100%, 40%);">- - build: asan
- cflags: "-fsan= itize=3Daddress -fno-sanitize-recover=3Dall -fno-optimize-sibling-calls -f= sanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
- ldflags: -fsani= tize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- - build: normal
- cflags: "-O2 -g"
<= span style=3D"color: hsl(0, 100%, 40%);">- ldflags: ""=

- cc: gcc
-
- name: "${{matrix.cc}} ${{matrix.bu= ild}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0"
- runs-on: ${{matrix.os}}
- env:

- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.ldflags }= }

- CC: ${{matrix.= cc}}
- UBSAN_OPTIO= NS: print_stacktrace=3D1
+ openssl4:
+ = uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: openssl
+ ovpnlibdesc: OpenSSL 4.
# vers= ioning=3Dsemver-coerced
- OPENSSL_REPO: openssl/openssl
- OPENSSL_VERSION: openssl-4.0.0-beta1
- OPENSSL_INSTALL: /opt/openssl
-
- steps:
- - name: Install dependencies
- run: sudo apt update && s= udo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2h= tml clang libcmocka-dev python3-docutils libtool automake autoconf pkg-conf= ig libcap-ng-dev libnl-genl-3-dev
- - name: Restore OpenSSL 4.0 from cache
- uses: actions/cache@...3010...
- id: openssl-cac= he
- with:
- path: ${{ env.OPE= NSSL_INSTALL }}
- = key: ${{ matrix.os }}-openssl-${{matrix.build }}-${{ env.OPENSSL_VERSIO= N }}
- - name: &qu= ot;openssl: checkout"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'true'<= /span>
- uses: actions/= checkout@...2998... # v6.0.2
- with:
- = path: openssl
= - repository: ${{ env.OPENSSL_REPO }}
- ref: ${{ env.OPENSSL_VERSION }}- - name: "openssl: c= onfigure"
- = if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- run: ./Configure --prefix= =3D${{ env.OPENSSL_INSTALL }} --libdir=3D${{ env.OPENSSL_INSTALL }}/lib --o= penssldir=3D${{ env.OPENSSL_INSTALL }} -g

- working-directory: openssl
- - name: "openssl: make all"= ;
- if: steps.op= enssl-cache.outputs.cache-hit !=3D 'true'
- run: make -j3
- working-directory: openssl
- - name: "openssl: make = install"

- = if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- run: sudo make install
- working-directory:= openssl
- - name:= "ldconfig"
-= run: sudo ldconfig
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
= - - name: autoconf- run: autoreconf -fvi
- - name: configure<= /span>
- run: |<= br>- OPENSSL_CFLAGS=3D&q= uot;-I${{ env.OPENSSL_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.OPENSSL= _INSTALL }}/lib -lssl -lcrypto" \
- LDFLAGS=3D"-Wl,-rpath=3D${{ env.OPENSSL_INS= TALL }}/lib" \
- = ./configure --with-crypto-library=3Dopenssl --enable-werror ${{matr= ix.configureflags}}
- = - name: make all
- = run: make -j3
- = - name: Ensure the build uses Openssl
- run: |
- ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version= | grep -q "library versions: OpenSSL 4.0"
- - name: configure checks
- run: echo 'RUN_SUDO=3D= "sudo -E"' >tests/t_server_null.rc

- - name: make check
- run: make -j3 check VERBOSE=3D1<= /span>
+ ghrepo: openss= l/openssl
+ gitr= ef: openssl-4.0.0-beta1
+ libconfigure: ./Configure --prefix=3D$LIBPREFIX --libdir=3D$LIBPR= EFIX/lib --openssldir=3D$LIBPREFIX -g

= mbedtls4:
- strategy= :
- fail-fast: fal= se
- matrix:
- os: [ubuntu-24.04]<= /span>
- ssllib: [mbedt= ls4]
- build: [ = normal, asan ]
- = include:
- - = build: asan
- = cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fno-opti= mize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-point= er -g -O1"
- = ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
<= span style=3D"color: hsl(0, 100%, 40%);">- cc: clang

<= span style=3D"color: hsl(0, 100%, 40%);">- - build: normal
<= br>- cflags: "-O2= -g"
- = ldflags: ""
-= cc: gcc
-
- name: "${{matr= ix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}"
- runs-on: ${{matrix.os}}=
- env:
- CFLAGS: ${{ matrix.cflags }}=

- LDFLAGS: ${{ ma= trix.ldflags }}
- = CC: ${{matrix.cc}}
- = UBSAN_OPTIONS: print_stacktrace=3D1
- PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig<= br>+ uses: ./.github/workflo= ws/test-ssllib.yml
+ = with:
+ libna= me: mbedtls
+ ov= pnlibname: mbedtls
+ = ovpnlibdesc: mbed TLS 4.
# versioning=3Dsemver-= coerced
- MBEDTLS_= REPO: Mbed-TLS/mbedtls
= - MBEDTLS_VERSION: v4.0.0
- MBEDTLS_INSTALL: /opt/mbedtls4
-
- - = name: Install dependencies
- run: sudo apt update && sudo apt install -y liblzo2-de= v libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev pytho= n3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg= -config libcap-ng-dev libnl-genl-3-dev
- - name: Restore mbed TLS from cache
- uses: actions/cache@...3010...=
- id: mbedtls-c= ache
- with:

- path: ${{ env.M= BEDTLS_INSTALL }}
- = key: ${{ matrix.os }}-mbedtls-${{matrix.build }}-${{ env.MBEDTLS_VERS= ION }}
- - name: &= quot;mbedtls: checkout"
- if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true'= ;
- uses: action= s/checkout@...2998... # v6.0.2
- with:
= - path: mbedtls
- repository: ${{ env.MBEDTLS_REPO }}
- ref: ${{ env.MBEDTLS_VERSION= }}
- - uses: lukk= a/get-cmake@...2999... # v4.2.3
- - name: "mbedtls: cmake"
- if: steps.mbedtls-cache.outputs.cache-= hit !=3D 'true'
- run: cmake -B build -DCMAKE_INSTALL_PREFIX=3D${{ env.MBEDTLS_INST= AL }}
- working-= directory: mbedtls
- = - name: "mbedtls: cmake --build"
- if: steps.mbedtls-cache.outputs.cache-hit != =3D 'true'
- = run: cmake --build build
- working-directory: mbedtls
- - name: "mbedtls: cmake --install"
- if: steps.mbedtls= -cache.outputs.cache-hit !=3D 'true'
- run: sudo cmake --install build
- working-directory: mbedtls=

- - name: Checkou= t OpenVPN
- uses= : actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure
- run: ./configure --with-crypto-library= =3Dmbedtls --enable-werror
- - name: make all
- run: make -j3
- - name: Ensure the build uses mbed TLS ${{ env.MBEDTLS_VERSION = }}
- run: |
- ./src/openvpn/op= envpn --version
- = ./src/openvpn/openvpn --version | grep -q "library versions: mbed = TLS 4."
- - n= ame: configure checks
-= run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_serv= er_null.rc
- - nam= e: make check
- = run: make -j3 check VERBOSE=3D1
+ ghrepo: Mbed-TLS/mbedtls
+ gitref: v4.0.0
+ libconfigure: cmake -B build -DCMAKE_INSTALL_= PREFIX=3D$LIBPREFIX
+= libmake: cmake --build build
+ libinstall: sudo cmake --install build
+ ovpnconfigureenv: PKG_CONFIG_= PATH=3D$LIBPREFIX/lib/pkgconfig


aws-lc= :
- strategy:=
- fail-fast: false
- matrix:
- os: [ubuntu-24.04]
- ssllib: [ awslc ]
- build: [ normal, a= san ]
- include:=
- - build: as= an
- cflags:= "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fno-optimize-sibl= ing-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1= "
- ldf= lags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- cxx: clang++
- - build: normal
- cflags: "-O2 -g&qu= ot;

- ldflag= s: ""
- = cc: gcc
- = cxx: c++
-- name: "${{matrix.cc}}= ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}"
- runs-on: ${{matrix.os}}
=
- env:
- CFLAGS: ${{ matrix.cflags }}=
- LDFLAGS: ${{ matrix.ld= flags }}
- CC: ${{= matrix.cc}}
- CXX:= ${{matrix.cxx}}
- = UBSAN_OPTIONS: print_stacktrace=3D1
- AWS_LC_INSTALL: /opt/aws-lc
+ uses: ./.github/workflows/test-ssllib.yml<= /span>
+ with:
= + libname: aws-lc+ ovpnlibdesc: AWS-LC
# versioning=3Dsemver-coerced
- AWS_LC_REPO: aws/aws-lc
- AWS_LC_VERSION: v1.70.0-
- steps:
- - name: Install dependencies
- run: sudo apt update && sudo apt = install -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-d= ev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jso= nschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev=
- - name: Restore= AWS-LC from cache
- = uses: actions/cache@...3010...
- id: aws-lc-cache
- with:
- path: ${{ env.AWS_LC_INSTALL }}
- key: ${{ matrix.os }}-aws-lc-${{matr= ix.build }}-${{ env.AWS_LC_VERSION }}
- - name: "AWS-LC: checkout"
- if: steps.aws-lc-cache.outputs= .cache-hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.0.2
- with:

- path: aws-lc
- repository: ${{ env.AWS_LC_REPO = }}
- ref: ${{ = env.AWS_LC_VERSION }}
-= - uses: lukka/get-cmake@...2999... # v4.2.3
- - name: "AWS-LC: build"<= br>- if: steps.aws-lc-cach= e.outputs.cache-hit !=3D 'true'
- run: |
- mkdir build
- cd build
- cmake -GNinja -DCMAKE_BUILD_TYPE=3DRelease -DCMAKE_INSTAL= L_PREFIX=3D"${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=3D1 ..= /
- ninja inst= all
- working-di= rectory: aws-lc
- = - name: Checkout OpenVPN
- - name: autoconf
- run: autoreconf -fvi
- - name: configure with AWS-LC=

- run: |=
- OPENSSL_CFLAGS=3D&= quot;-I${{ env.AWS_LC_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.AWS_LC_= INSTALL }}/lib -lssl -lcrypto" \
- LDFLAGS=3D"-Wl,-rpath=3D${{ env.AWS_LC_INSTA= LL }}/lib" \
- = ./configure --with-crypto-library=3Dopenssl
- - name: make all
- run: make -j3
- - name: Ensure the build uses AWS-LC
- run: |
= - ./src/openvpn/openvpn = --version
- ./= src/openvpn/openvpn --version | grep -q "library versions: AWS-LC"= ;
- - name: config= ure checks
- run= : echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc<= /span>
- - name: make che= ck
- run: make -= j3 check VERBOSE=3D1
= + ghrepo: aws/aws-lc
+ gitref: v1.70.0
+ libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=3DRel= ease -DCMAKE_INSTALL_PREFIX=3D"$LIBPREFIX" -DBUILD_SHARED_LIBS=3D= 1
+ libmake: cma= ke --build build
+ = libinstall: sudo cmake --install build
+ # not ready for --enable-werror
+ ovpnconfigureflags:
diff --git a/.github/workflows/test-ssllib.yml b/.github/workflows/t= est-ssllib.yml
new file mode 100644
index 0= 000000..c6a2e44
--- /dev/null
+++ b/.github= /workflows/test-ssllib.yml
@@ -0,0 +1,117 @@
+name: test_ssllib

+
+on:
+ workflow_call:
= + inputs:
+ l= ibname:
+ requ= ired: true
+ t= ype: string
+ ov= pnlibname:
+ t= ype: string
+ = default: openssl
+ = ovpnlibdesc:
+ = required: true
+ = type: string
+= ghrepo:
+ = required: true
+ = type: string
+ = gitref:
+ = required: true
+ = type: string
+ = libconfigure:
+ = required: true
+ = type: string
+= libmake:
+ = type: string
+ = default: "make -j3"
+ libinstall:
+ type: string
+ default: "sudo make install"
+ ovpnconfigureenv:

<= span style=3D"color: hsl(120, 100%, 40%);">+ type: string
= + default: >-<= br>+ OPENSSL_CFLAGS=3D= "-I$LIBPREFIX/include"
+ OPENSSL_LIBS=3D"-L$LIBPREFIX/lib -lssl -lcrypto= "
+ LDF= LAGS=3D"-Wl,-rpath=3D$LIBPREFIX/lib"
+ ovpnconfigureflags:
+ type: string
+ default: --enable-werror --with-= openssl-engine=3Dno
+=
+jobs:
+ test_ssllib:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-24.04]
+ build: [normal, asan]
= + include:
+ - build: asan+ cflags: "-fs= anitize=3Daddress -fno-sanitize-recover=3Dall -fno-optimize-sibling-calls = -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
+ ldflags: -f= sanitize=3Daddress -fno-sanitize-recover=3Dall
+ cc: clang
+ cxx: clang++
+ - build: normal
+ cflags: "-O2 -g&qu= ot;
+ ldfl= ags: ""
+ = cc: gcc
+ = cxx: g++
+<= /span>
+ name: "${{m= atrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{inputs.libname}}"
+ runs-on: ${{matri= x.os}}
+ env:
+ CFLAGS: ${{matrix.= cflags}}
+ LDFLA= GS: ${{matrix.ldflags}}
+ CC: ${{matrix.cc}}
+ CXX: ${{matrix.cxx}}
+ UBSAN_OPTIONS: print_stacktrace=3D1
+ LIBPREFIX: /opt/${{inputs.libna= me}}
+
+ steps:

+ - name: Install dependencies=
+ run: sudo apt upda= te && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux= -libc-dev man2html clang libcmocka-dev python3-docutils libtool automake au= toconf pkg-config libcap-ng-dev libnl-genl-3-dev
+ - name: Restore ${{inputs.libname}} from= cache
+ uses:= actions/cache@...3024... # v5.0.5
+ id: ssllib-cache
+ with:
+ path: ${{env.LIBPREFIX}}
+ key: ${{matrix.os}}-${{inputs.libnam= e}}-${{matrix.build }}-${{inputs.gitref}}
+ - name: "${{inputs.libname}}: checkout&quo= t;
+ if: steps= .ssllib-cache.outputs.cache-hit !=3D 'true'
+ uses: actions/checkout@...2998...= # v6.0.2
+ wi= th:
+ submod= ules: recursive
+ = path: ${{inputs.libname}}
+ repository: ${{inputs.ghrepo}}
+ ref: ${{inputs.gitref}}<= br>+ - name: "${{inpu= ts.libname}}: configure"
+ if: steps.ssllib-cache.outputs.cache-hit !=3D 'true&#= 39;
+ run: ${{= inputs.libconfigure}}
+ working-directory: ${{inputs.libname}}
+ - name: "${{inputs.libname}}: build= "
+ if: s= teps.ssllib-cache.outputs.cache-hit !=3D 'true'
+ run: ${{inputs.libmake}}=
+ working-directory:= ${{inputs.libname}}
= + - name: "${{inputs.libname}}: install"
+ if: steps.ssllib-cache.outputs.= cache-hit !=3D 'true'
+ run: ${{inputs.libinstall}}
+ working-directory: ${{inputs.libname}}
+ - name: Run ldco= nfig
+ run: su= do ldconfig
+ - = name: "OpenVPN: checkout"
+ uses: actions/checkout@...2998... # v6.0.2+ - name: "OpenVPN:= autoreconf"
+ = run: autoreconf -fvi
+ - name: "OpenVPN: configure"
+ run: |
+ ${{inputs.ovpnconfigureenv}} \

+ ./configure --w= ith-crypto-library=3D${{inputs.ovpnlibname}} ${{inputs.ovpnconfigureflags}}=
+ - name: "= ;OpenVPN: build"
+ run: make -j3
+ - name: Ensure the build uses ${{inputs.libname}}
+ run: |
+ ./src/openvpn/openvpn --versio= n
+ ./src/op= envpn/openvpn --version | grep -q "library versions: ${{inputs.ovpnlib= desc}}"
+ -= name: "OpenVPN: configure checks"
+ run: echo 'RUN_SUDO=3D"sudo -E&qu= ot;' >tests/t_server_null.rc
+ - name: "OpenVPN: make check"
+ run: make -j3 check VERBO= SE=3D1
diff --git a/renovate.json b/renovate.jsonindex f9c62c4..809ac3f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -40,7 +40,7 @@<= br> "/^\\.github/workflows/.+\\.ya?ml$/"
],
"matchStrin= gs": [
- = "versioning=3D(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<= depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n"
+ "= ;versioning=3D(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*= ?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n"
= ],
"datasourceTemplate": = "github-tags"
}
<= br>

To view, visit change 1630. To unsubscribe, or for help writing mai= l filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a= 518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: uddr <yura.uddr@...277...&= gt;
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --mWjSRGC4VdM=--