diff options
| -rwxr-xr-x | testing/scripts/build-umlrootfs | 8 | ||||
| -rwxr-xr-x | testing/testing.conf | 3 | ||||
| -rw-r--r-- | testing/tests/ikev2/rw-eap-sim-rsa/hosts/carol/etc/strongswan.conf | 2 | ||||
| -rw-r--r-- | testing/tests/ikev2/rw-eap-sim-rsa/hosts/moon/etc/strongswan.conf | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs index 49988d203..119dbcaf2 100755 --- a/testing/scripts/build-umlrootfs +++ b/testing/scripts/build-umlrootfs @@ -148,6 +148,7 @@ fi if [ "$USE_EAP_SIM" = "yes" ] then echo -n " --enable-eap-sim" >> $INSTALLSHELL + echo -n " --enable-eap-sim-file >> $INSTANTSHELL fi if [ "$USE_EAP_MD5" = "yes" ] @@ -174,7 +175,12 @@ if [ "$USE_OPENSSL" = "yes" ] then echo -n " --enable-openssl" >> $INSTALLSHELL fi - + +if [ "$USE_KERNEL_PFKEY" = "yes" ] +then + echo -n " --enable-kernel-pfkey" >> $INSTALLSHELL +fi + if [ "$USE_INTEGRITY_TEST" = "yes" ] then echo -n " --enable-integrity-test" >> $INSTALLSHELL diff --git a/testing/testing.conf b/testing/testing.conf index abb5ba097..6ffa930d7 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -21,7 +21,7 @@ UMLTESTDIR=~/strongswan-testing # Bzipped kernel sources # (file extension .tar.bz2 required) -KERNEL=$UMLTESTDIR/linux-2.6.26.5.tar.bz2 +KERNEL=$UMLTESTDIR/linux-2.6.27.tar.bz2 # Extract kernel version KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'` @@ -45,6 +45,7 @@ USE_EAP_IDENTITY="yes" USE_SQL="yes" USE_MEDIATION="yes" USE_OPENSSL="yes" +USE_KERNEL_PFKEY="no" USE_INTEGRITY_TEST="no" USE_LEAK_DETECTIVE="no" diff --git a/testing/tests/ikev2/rw-eap-sim-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-sim-rsa/hosts/carol/etc/strongswan.conf index a80c7868d..d1adc88e7 100644 --- a/testing/tests/ikev2/rw-eap-sim-rsa/hosts/carol/etc/strongswan.conf +++ b/testing/tests/ikev2/rw-eap-sim-rsa/hosts/carol/etc/strongswan.conf @@ -1,5 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink fips-prf eapsim + load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink fips-prf eapsim eapsim-file } diff --git a/testing/tests/ikev2/rw-eap-sim-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-sim-rsa/hosts/moon/etc/strongswan.conf index a80c7868d..d1adc88e7 100644 --- a/testing/tests/ikev2/rw-eap-sim-rsa/hosts/moon/etc/strongswan.conf +++ b/testing/tests/ikev2/rw-eap-sim-rsa/hosts/moon/etc/strongswan.conf @@ -1,5 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink fips-prf eapsim + load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink fips-prf eapsim eapsim-file } |