Skip to content

Update hitch support. #9897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kareem-wolfssl wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −7
Open

Update hitch support. #9897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f04d7
Update hitch configure
kareem-wolfssl Feb 16, 2026
0b8bec8
Update and re-enable hitch CI/CD test.
kareem-wolfssl Mar 5, 2026
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
15 changes: 8 additions & 7 deletions .github/workflows/disabled/hitch.yml → .github/workflows/hitch.yml
View file
Open in desktop
Copy link
Member

@julek-wolfssl julek-wolfssl Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use matrix.ref than hard coding the version everywhere.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 9 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
Loading