Merge branch 'master' into testing-per-cpu-sas

configure.ac

@@ -20,7 +20,7 @@
 #  initialize & set some vars
 # ============================
 
-AC_INIT([strongSwan],[6.0.3])
+AC_INIT([strongSwan],[6.0.4rc1])
 AM_INIT_AUTOMAKE(m4_esyscmd([
 	echo tar-ustar
 	echo subdir-objects

src/libstrongswan/credentials/credential_manager.c

@@ -788,6 +788,7 @@ static bool verify_trust_chain(private_credential_manager_t *this,
 					DBG1(DBG_CFG, "  self-signed certificate \"%Y\" is not "
 						 "trusted", current->get_subject(current));
 					issuer->destroy(issuer);
+					signature_params_destroy(scheme);
 					call_hook(this, CRED_HOOK_UNTRUSTED_ROOT, current);
 					break;
 				}

testing/testing.conf

@@ -24,14 +24,14 @@ fi
 : ${TESTDIR=/srv/strongswan-testing}
 
 # Kernel configuration
-: ${KERNELVERSION=6.17.4}
+: ${KERNELVERSION=6.18}
 : ${KERNEL=linux-$KERNELVERSION}
 : ${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}
 
 # strongSwan version used in tests
-: ${SWANVERSION=6.0.3}
+: ${SWANVERSION=6.0.4rc1}
 
 # Build directory where the guest kernel and images will be built
 : ${BUILDDIR=$TESTDIR/build}