Skip to content

Commit

Permalink
Ping the Tunnelblick patches to version v6.0beta09
Browse files Browse the repository at this point in the history
Signed-off-by: Marius Sincovici <marius.sincovici@nordsec.com>

The patches for OpenVPN 2.6.12 were removed from master and other tags.
The last tag containing the patches is v6.0beta09.
  • Loading branch information
mariusSincovici committed Jan 29, 2025
1 parent e33cabb commit 438317b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 2 additions & 3 deletions ci/openvpn/check_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ source "${WORKDIR}/ci/openvpn/env.sh"

openvpn_tarbal_dir="${WORKDIR}/build/openvpn/tarballs"

tunnelblick_sha256sum="ea4e810e15c963a53fe3625cf37e078ed118b9a6879d92ce9a01c3395c9aad42"
tunnelblick_url="https://github.com/Tunnelblick/Tunnelblick/raw/master/third_party/sources"
tunnelblick_url="https://github.com/Tunnelblick/Tunnelblick/raw/refs/tags/${TUNNELBLICK_TAG}/third_party/sources"

mkdir -p "${openvpn_tarbal_dir}"
pushd "${openvpn_tarbal_dir}"
Expand All @@ -31,5 +30,5 @@ pushd "${openvpn_patches_dir}"
wget -nv -nc "${tunnelblick_url}/openvpn/openvpn-${OPENVPN_VERSION}/patches/04-tunnelblick-openvpn_xorpatch-c.diff"
wget -nv -nc "${tunnelblick_url}/openvpn/openvpn-${OPENVPN_VERSION}/patches/05-tunnelblick-openvpn_xorpatch-d.diff"
wget -nv -nc "${tunnelblick_url}/openvpn/openvpn-${OPENVPN_VERSION}/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
[[ "$(sha256sum <<< "$(cat ./*diff)" | awk $'{print $1}')" == "${tunnelblick_sha256sum}" ]] || exit 1
[[ "$(sha256sum <<< "$(cat ./*diff)" | awk $'{print $1}')" == "${TUNNELBLICK_SHA256SUM}" ]] || exit 1
popd
7 changes: 7 additions & 0 deletions ci/openvpn/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@

set -euxo pipefail

# This needs to be in sync with TUNNELBLICK_TAG
OPENVPN_VERSION="2.6.12"
export OPENVPN_VERSION
OPENVPN_SHA256SUM="1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929"
export OPENVPN_SHA256SUM

# Used to download the patches for OpenVPN obfuscation. This needs to be in sync with OPENVPN_VERSION.
TUNNELBLICK_TAG="v6.0beta09" # it is a beta tag, because no other non-beta still has version 2.6.12
export TUNNELBLICK_TAG
TUNNELBLICK_SHA256SUM="ea4e810e15c963a53fe3625cf37e078ed118b9a6879d92ce9a01c3395c9aad42"
export TUNNELBLICK_SHA256SUM

OPENSSL_VERSION="3.0.14"
export OPENSSL_VERSION
OPENSSL_SHA256SUM="eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"
Expand Down

0 comments on commit 438317b

Please sign in to comment.