aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtesting/scripts/build-umlrootfs9
-rwxr-xr-xtesting/testing.conf7
2 files changed, 11 insertions, 5 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index a61cfbf20..16dd843b9 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -206,9 +206,9 @@ then
echo -n " --enable-leak-detective" >> $INSTALLSHELL
fi
-if [ "$USE_LOAD_TESTS" = "yes" ]
+if [ "$USE_LOAD_TESTER" = "yes" ]
then
- echo -n " --enable-load-tests" >> $INSTALLSHELL
+ echo -n " --enable-load-tester" >> $INSTALLSHELL
fi
if [ "$USE_TEST_VECTORS" = "yes" ]
@@ -226,6 +226,11 @@ then
echo -n " --enable-socket-default" >> $INSTALLSHELL
fi
+if [ "$USE_SOCKET_DYNAMIC" = "yes" ]
+then
+ echo -n " --enable-socket-dynamic" >> $INSTALLSHELL
+fi
+
if [ "$USE_DHCP" = "yes" ]
then
echo -n " --enable-dhcp" >> $INSTALLSHELL
diff --git a/testing/testing.conf b/testing/testing.conf
index 8bee4374f..c7852d28f 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -19,7 +19,7 @@ UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources
# (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.33.1.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.33.3.tar.bz2
# Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -28,7 +28,7 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
KERNELCONFIG=$UMLTESTDIR/.config-2.6.33
# Bzipped uml patch for kernel
-#UMLPATCH=$UMLTESTDIR/aead_init.patch.bz2
+UMLPATCH=$UMLTESTDIR/aes_gmac.patch.bz2
# Bzipped source of strongSwan
STRONGSWAN=$UMLTESTDIR/strongswan-4.4.0.tar.bz2
@@ -49,10 +49,11 @@ USE_BLOWFISH="yes"
USE_KERNEL_PFKEY="yes"
USE_INTEGRITY_TEST="yes"
USE_LEAK_DETECTIVE="yes"
-USE_LOAD_TESTS="yes"
+USE_LOAD_TESTER="yes"
USE_TEST_VECTORS="yes"
USE_GCRYPT="yes"
USE_SOCKET_DEFAULT="yes"
+USE_SOCKET_DYNAMIC="yes"
USE_DHCP="yes"
USE_FARP="yes"