From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 20 Aug 2010 10:47:15 +0000 (+0200)
Subject: enable the ccm and gcm plugins in the UML scenarios
X-Git-Tag: 4.5.0~438
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=906680029dc05606fa1b92221092f020f70b0b2f;p=thirdparty%2Fstrongswan.git

enable the ccm and gcm plugins in the UML scenarios
---

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index a44e9b44d6..7e6822d174 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -262,6 +262,16 @@ then
     echo -n " --enable-ctr" >> $INSTALLSHELL
 fi
 
+if [ "$USE_CCM" = "yes" ]
+then
+    echo -n " --enable-ccm" >> $INSTALLSHELL
+fi
+
+if [ "$USE_GCM" = "yes" ]
+then
+    echo -n " --enable-gcm" >> $INSTALLSHELL
+fi
+
 echo "" >> $INSTALLSHELL
 echo "make" >> $INSTALLSHELL
 echo "make install" >> $INSTALLSHELL
diff --git a/testing/testing.conf b/testing/testing.conf
index 4031e99f76..0a5b1a135f 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.35.1.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.35.2.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -60,6 +60,8 @@ USE_DHCP="yes"
 USE_FARP="yes"
 USE_ADDRBLOCK="yes"
 USE_CTR="yes"
+USE_CCM="yes"
+USE_GCM="yes"
 
 # Gentoo linux root filesystem
 ROOTFS=$UMLTESTDIR/gentoo-fs-20100805.tar.bz2