Merge branch 'master' into testing-per-cpu-sas
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@
|
|||||||
# initialize & set some vars
|
# initialize & set some vars
|
||||||
# ============================
|
# ============================
|
||||||
|
|
||||||
AC_INIT([strongSwan],[6.0.3])
|
AC_INIT([strongSwan],[6.0.4rc1])
|
||||||
AM_INIT_AUTOMAKE(m4_esyscmd([
|
AM_INIT_AUTOMAKE(m4_esyscmd([
|
||||||
echo tar-ustar
|
echo tar-ustar
|
||||||
echo subdir-objects
|
echo subdir-objects
|
||||||
|
|||||||
@@ -788,6 +788,7 @@ static bool verify_trust_chain(private_credential_manager_t *this,
|
|||||||
DBG1(DBG_CFG, " self-signed certificate \"%Y\" is not "
|
DBG1(DBG_CFG, " self-signed certificate \"%Y\" is not "
|
||||||
"trusted", current->get_subject(current));
|
"trusted", current->get_subject(current));
|
||||||
issuer->destroy(issuer);
|
issuer->destroy(issuer);
|
||||||
|
signature_params_destroy(scheme);
|
||||||
call_hook(this, CRED_HOOK_UNTRUSTED_ROOT, current);
|
call_hook(this, CRED_HOOK_UNTRUSTED_ROOT, current);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -24,14 +24,14 @@ fi
|
|||||||
: ${TESTDIR=/srv/strongswan-testing}
|
: ${TESTDIR=/srv/strongswan-testing}
|
||||||
|
|
||||||
# Kernel configuration
|
# Kernel configuration
|
||||||
: ${KERNELVERSION=6.17.4}
|
: ${KERNELVERSION=6.18}
|
||||||
: ${KERNEL=linux-$KERNELVERSION}
|
: ${KERNEL=linux-$KERNELVERSION}
|
||||||
: ${KERNELTARBALL=$KERNEL.tar.xz}
|
: ${KERNELTARBALL=$KERNEL.tar.xz}
|
||||||
: ${KERNELCONFIG=$DIR/../config/kernel/config-6.17}
|
: ${KERNELCONFIG=$DIR/../config/kernel/config-6.18}
|
||||||
: ${KERNELPATCH=ha-6.17-abicompat.patch.bz2}
|
: ${KERNELPATCH=ha-6.17-abicompat.patch.bz2}
|
||||||
|
|
||||||
# strongSwan version used in tests
|
# strongSwan version used in tests
|
||||||
: ${SWANVERSION=6.0.3}
|
: ${SWANVERSION=6.0.4rc1}
|
||||||
|
|
||||||
# Build directory where the guest kernel and images will be built
|
# Build directory where the guest kernel and images will be built
|
||||||
: ${BUILDDIR=$TESTDIR/build}
|
: ${BUILDDIR=$TESTDIR/build}
|
||||||
|
|||||||
Reference in New Issue
Block a user