From b293aa30819ab856f66a4a55220f3a12cb67826d Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Mon, 11 May 2020 10:59:08 -0500 Subject: [PATCH] New Libreswan version - Upgrade Libreswan to 3.32 --- vpnsetup.sh | 7 +------ vpnsetup_centos.sh | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/vpnsetup.sh b/vpnsetup.sh index bb2e3ff..e07d79e 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -173,7 +173,7 @@ apt-get -yq install fail2ban || exiterr2 bigecho "Compiling and installing Libreswan..." -SWAN_VER=3.31 +SWAN_VER=3.32 swan_file="libreswan-$SWAN_VER.tar.gz" swan_url1="https://github.com/libreswan/libreswan/archive/v$SWAN_VER.tar.gz" swan_url2="https://download.libreswan.org/$swan_file" @@ -183,11 +183,6 @@ fi /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xzf "$swan_file" && /bin/rm -f "$swan_file" cd "libreswan-$SWAN_VER" || exit 1 -if [ "$SWAN_VER" = "3.31" ]; then - sed -i '916iif (!st->st_seen_fragvid) { return FALSE; }' programs/pluto/ikev2.c - sed -i '1033s/if (/if (LIN(POLICY_IKE_FRAG_ALLOW, sk->ike->sa.st_connection->policy) \&\& sk->ike->sa.st_seen_fragvid \&\& /' \ - programs/pluto/ikev2_message.c -fi cat > Makefile.inc.local <<'EOF' WERROR_CFLAGS = -w USE_DNSSEC = false diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh index a7a6079..d2783e8 100755 --- a/vpnsetup_centos.sh +++ b/vpnsetup_centos.sh @@ -171,7 +171,7 @@ yum "$REPO1" -y install fail2ban || exiterr2 bigecho "Compiling and installing Libreswan..." -SWAN_VER=3.31 +SWAN_VER=3.32 swan_file="libreswan-$SWAN_VER.tar.gz" swan_url1="https://github.com/libreswan/libreswan/archive/v$SWAN_VER.tar.gz" swan_url2="https://download.libreswan.org/$swan_file" @@ -181,11 +181,6 @@ fi /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xzf "$swan_file" && /bin/rm -f "$swan_file" cd "libreswan-$SWAN_VER" || exit 1 -if [ "$SWAN_VER" = "3.31" ]; then - sed -i '916iif (!st->st_seen_fragvid) { return FALSE; }' programs/pluto/ikev2.c - sed -i '1033s/if (/if (LIN(POLICY_IKE_FRAG_ALLOW, sk->ike->sa.st_connection->policy) \&\& sk->ike->sa.st_seen_fragvid \&\& /' \ - programs/pluto/ikev2_message.c -fi cat > Makefile.inc.local <<'EOF' WERROR_CFLAGS = -w USE_DNSSEC = false