From 02f04d706f2fa9b55a5fd1f9d53fd696c958a2ab Mon Sep 17 00:00:00 2001 From: Kareem Date: Mon, 16 Feb 2026 11:34:07 -0700 Subject: [PATCH 1/2] Update hitch configure --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index ca375b7a23..a1f32bdb56 100644 --- a/configure.ac +++ b/configure.ac @@ -8144,6 +8144,13 @@ then ENABLED_OCSP="yes" fi + # Requires CSR for wolfSSL_set_tlsext_status_ocsp_resp + if test "x$ENABLED_CERTIFICATE_STATUS_REQUEST" = "xno" + then + ENABLED_CERTIFICATE_STATUS_REQUEST="yes" + AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_CERTIFICATE_STATUS_REQUEST" + fi + # Requires ALPN if test "x$ENABLED_ALPN" = "xno" then @@ -8166,6 +8173,8 @@ then AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HITCH -DHAVE_EX_DATA -DWOLFSSL_SIGNER_DER_CERT" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_COMPATIBLE_DEFAULTS -DWOLFSSL_CIPHER_INTERNALNAME" + # wolfSSL inclusion of assert.h conflicts with hitch's assert definition + AM_CFLAGS="$AM_CFLAGS -DWC_NO_STATIC_ASSERT" fi if test "$ENABLED_MEMCACHED" = "yes" From 0b8bec88f0265a709d2ee2144d08eda6291b42e7 Mon Sep 17 00:00:00 2001 From: Kareem Date: Thu, 5 Mar 2026 16:45:30 -0700 Subject: [PATCH 2/2] Update and re-enable hitch CI/CD test. Requires https://github.com/wolfSSL/osp/pull/325. Fixes https://github.com/wolfSSL/osp/issues/218. --- .github/workflows/{disabled => }/hitch.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) rename .github/workflows/{disabled => }/hitch.yml (80%) diff --git a/.github/workflows/disabled/hitch.yml b/.github/workflows/hitch.yml similarity index 80% rename from .github/workflows/disabled/hitch.yml rename to .github/workflows/hitch.yml index 5f0b58986b..adbe7ae20e 100644 --- a/.github/workflows/disabled/hitch.yml +++ b/.github/workflows/hitch.yml @@ -44,9 +44,9 @@ jobs: matrix: # List of releases to test include: - - ref: 1.7.3 + - ref: 1.8.0 ignore-tests: >- - test13-r82.sh test15-proxy-v2-npn.sh test39-client-cert-proxy.sh + test12-cfg.sh test13-r82.sh test15-proxy-v2-npn.sh test39-client-cert-proxy.sh test41-client-cert-pb.sh name: ${{ matrix.ref }} if: github.repository_owner == 'wolfssl' runs-on: ubuntu-latest @@ -72,13 +72,13 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive sudo apt-get update - sudo apt-get install -y libev-dev libssl-dev automake python3-docutils flex bison pkg-config make + sudo apt-get install -y libev-dev automake python3-docutils flex bison pkg-config make - name: Checkout hitch uses: actions/checkout@v4 with: repository: varnish/hitch - ref: 1.7.3 + ref: 1.8.0 path: hitch # Do this before configuring so that it only detects the updated list of @@ -92,9 +92,10 @@ jobs: - name: Configure and build hitch run: | cd $GITHUB_WORKSPACE/hitch/ - patch -p1 < $GITHUB_WORKSPACE/osp/hitch/hitch_1.7.3.patch - autoreconf -ivf - SSL_CFLAGS="-I$GITHUB_WORKSPACE/build-dir/include/ -I$GITHUB_WORKSPACE/build-dir/include/wolfssl" SSL_LIBS="-L$GITHUB_WORKSPACE/build-dir/lib -lwolfssl" ./configure --with-wolfssl=$GITHUB_WORKSPACE/build-dir/ --enable-silent-rules --enable-documentation --enable-warnings --with-lex --with-yacc --prefix=$GITHUB_WORKSPACE/build-dir + patch -p1 < $GITHUB_WORKSPACE/osp/hitch/hitch_1.8.0.patch + export SSL_CFLAGS="-I$GITHUB_WORKSPACE/build-dir/include/ -I$GITHUB_WORKSPACE/build-dir/include/wolfssl" + export SSL_LIBS="-L$GITHUB_WORKSPACE/build-dir/lib -lwolfssl" + ./bootstrap --with-wolfssl=$GITHUB_WORKSPACE/build-dir/ --prefix=$GITHUB_WORKSPACE/build-dir make -j$(nproc) - name: Confirm hitch built with wolfSSL