Merge branch 'tkm'

This adds charon-tkm a special build of the charon IKEv2 daemon that delegates
security critical operations to a separate process (TKM = Trusted Key Manager).

9 files changed, 130 insertions, 1 deletions

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 684730ced..a5830caa9 100755
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -16,6 +16,8 @@ INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc
 INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev
 INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
 INC=$INC,less,acpid,acpi-support-base,libldns-dev,libunbound-dev,dnsutils,screen
+INC=$INC,gnat,gprbuild,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev
+INC=$INC,libalog0.4.1-base-dev
 SERVICES="apache2 dbus isc-dhcp-server slapd bind9"
 INC=$INC,${SERVICES// /,}
 EXC=iptables
diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 3e0709db9..b93c868d2 100755
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -46,6 +46,8 @@ do
 	execute "mount $NBDPARTITION $LOOPDIR" 0
 	execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0
 	execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0
+	execute_chroot "ldconfig" 0
+
 	if [ "$host" = "winnetou" ]
 	then
 		execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk
new file mode 100644
index 000000000..1ecb7b294
--- /dev/null
+++ b/testing/scripts/recipes/005_anet.mk
@@ -0,0 +1,19 @@
+#!/usr/bin/make
+
+PKG = anet
+SRC = http://git.codelabs.ch/git/$(PKG).git
+REV = v0.2.2
+
+all: install
+
+.$(PKG)-cloned:
+	git clone $(SRC) $(PKG)
+	cd $(PKG) && git checkout $(REV)
+	@touch $@
+
+.$(PKG)-built: .$(PKG)-cloned
+	cd $(PKG) && make tests && make LIBRARY_KIND=static
+	@touch $@
+
+install: .$(PKG)-built
+	cd $(PKG) && make LIBRARY_KIND=static install
diff --git a/testing/scripts/recipes/006_tkm-rpc.mk b/testing/scripts/recipes/006_tkm-rpc.mk
new file mode 100644
index 000000000..571d590d1
--- /dev/null
+++ b/testing/scripts/recipes/006_tkm-rpc.mk
@@ -0,0 +1,21 @@
+#!/usr/bin/make
+
+PKG = tkm-rpc
+SRC = http://git.codelabs.ch/git/$(PKG).git
+REV = v0.1
+
+export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+
+all: install
+
+.$(PKG)-cloned:
+	git clone $(SRC) $(PKG)
+	cd $(PKG) && git checkout $(REV)
+	@touch $@
+
+.$(PKG)-built: .$(PKG)-cloned
+	cd $(PKG) && make tests && make
+	@touch $@
+
+install: .$(PKG)-built
+	cd $(PKG) && make install
diff --git a/testing/scripts/recipes/007_x509-ada.mk b/testing/scripts/recipes/007_x509-ada.mk
new file mode 100644
index 000000000..319a6e28b
--- /dev/null
+++ b/testing/scripts/recipes/007_x509-ada.mk
@@ -0,0 +1,19 @@
+#!/usr/bin/make
+
+PKG = x509-ada
+SRC = http://git.codelabs.ch/git/$(PKG).git
+REV = v0.1
+
+all: install
+
+.$(PKG)-cloned:
+	git clone $(SRC) $(PKG)
+	cd $(PKG) && git checkout $(REV)
+	@touch $@
+
+.$(PKG)-built: .$(PKG)-cloned
+	cd $(PKG) && make tests && make
+	@touch $@
+
+install: .$(PKG)-built
+	cd $(PKG) && make install
diff --git a/testing/scripts/recipes/008_xfrm-ada.mk b/testing/scripts/recipes/008_xfrm-ada.mk
new file mode 100644
index 000000000..f44a2822b
--- /dev/null
+++ b/testing/scripts/recipes/008_xfrm-ada.mk
@@ -0,0 +1,21 @@
+#!/usr/bin/make
+
+PKG = xfrm-ada
+SRC = http://git.codelabs.ch/git/$(PKG).git
+REV = v0.1
+
+export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+
+all: install
+
+.$(PKG)-cloned:
+	git clone $(SRC) $(PKG)
+	cd $(PKG) && git checkout $(REV)
+	@touch $@
+
+.$(PKG)-built: .$(PKG)-cloned
+	cd $(PKG) && make
+	@touch $@
+
+install: .$(PKG)-built
+	cd $(PKG) && make install
diff --git a/testing/scripts/recipes/009_tkm.mk b/testing/scripts/recipes/009_tkm.mk
new file mode 100644
index 000000000..e8ced8a61
--- /dev/null
+++ b/testing/scripts/recipes/009_tkm.mk
@@ -0,0 +1,21 @@
+#!/usr/bin/make
+
+PKG = tkm
+SRC = http://git.codelabs.ch/git/$(PKG).git
+REV = v0.1
+
+export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+
+all: install
+
+.$(PKG)-cloned:
+	git clone $(SRC) $(PKG)
+	cd $(PKG) && git checkout $(REV)
+	@touch $@
+
+.$(PKG)-built: .$(PKG)-cloned
+	cd $(PKG) && make tests && make
+	@touch $@
+
+install: .$(PKG)-built
+	cd $(PKG) && make install
diff --git a/testing/scripts/recipes/005_strongswan.mk b/testing/scripts/recipes/010_strongswan.mk
index 8bac5aa07..4390bf49f 100644
--- a/testing/scripts/recipes/005_strongswan.mk
+++ b/testing/scripts/recipes/010_strongswan.mk
@@ -69,7 +69,10 @@ CONFIG_OPTS = \
 	--enable-pkcs8 \
 	--enable-unity \
 	--enable-unbound \
-	--enable-ipseckey
+	--enable-ipseckey \
+	--enable-tkm
+
+export ADA_PROJECT_PATH=/root/libraries/lib/gnat
 
 all: install
 
diff --git a/testing/scripts/recipes/011_xfrm-proxy.mk b/testing/scripts/recipes/011_xfrm-proxy.mk
new file mode 100644
index 000000000..aea69703d
--- /dev/null
+++ b/testing/scripts/recipes/011_xfrm-proxy.mk
@@ -0,0 +1,21 @@
+#!/usr/bin/make
+
+PKG = xfrm-proxy
+SRC = http://git.codelabs.ch/git/$(PKG).git
+REV = v0.1
+
+export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+
+all: install
+
+.$(PKG)-cloned:
+	git clone $(SRC) $(PKG)
+	cd $(PKG) && git checkout $(REV)
+	@touch $@
+
+.$(PKG)-built: .$(PKG)-cloned
+	cd $(PKG) && make
+	@touch $@
+
+install: .$(PKG)-built
+	cd $(PKG) && make install