testing: Use multi-CA aware TKM

Also add CA ID to tkm_keymanager command.

diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk
index a999ef83fee9e20d855b9fbb16c0fc96a27603c3..4d8af638a0a16859077f5d83b7c7f612b6ff776e 100644 (file)
--- a/testing/scripts/recipes/010_tkm.mk
+++ b/testing/scripts/recipes/010_tkm.mk
@@ -2,7 +2,7 @@
 
 PKG = tkm
 SRC = https://git.codelabs.ch/git/$(PKG).git
-REV = 53d224a7312124516aa6220743355c896be6345a
+REV = 5320ec82f2221d9c4d5be106f6b90287bfb4acce
 
 export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
 

diff --git a/testing/tests/tkm/host2host-initiator/pretest.dat b/testing/tests/tkm/host2host-initiator/pretest.dat
index 7cb90ac26139a9490517a8206394c0cceac60776..6be277737f4effd65062b7202760790e9aa6f61c 100644 (file)
--- a/testing/tests/tkm/host2host-initiator/pretest.dat
+++ b/testing/tests/tkm/host2host-initiator/pretest.dat
@@ -1,7 +1,7 @@
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 sun::ipsec start

diff --git a/testing/tests/tkm/host2host-responder/pretest.dat b/testing/tests/tkm/host2host-responder/pretest.dat
index 40e84453f3b04cd0896d791d66d059de84a1bc25..9f8c7be1fcf6d43e5a3ef77c8eb893afa8f222ec 100644 (file)
--- a/testing/tests/tkm/host2host-responder/pretest.dat
+++ b/testing/tests/tkm/host2host-responder/pretest.dat
@@ -1,7 +1,7 @@
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 sun::ipsec start

diff --git a/testing/tests/tkm/host2host-xfrmproxy/pretest.dat b/testing/tests/tkm/host2host-xfrmproxy/pretest.dat
index d645ddbfe9c568e1566e56081c32f5da43049dfc..9d2d2580c1ae7ed4bb68161b597b384447e39b93 100644 (file)
--- a/testing/tests/tkm/host2host-xfrmproxy/pretest.dat
+++ b/testing/tests/tkm/host2host-xfrmproxy/pretest.dat
@@ -2,7 +2,7 @@ sun::ipsec start
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 moon::expect-file /tmp/tkm.rpc.ees

diff --git a/testing/tests/tkm/multiple-clients/pretest.dat b/testing/tests/tkm/multiple-clients/pretest.dat
index ec83662f5cd16edc1d38e1802c23a592ecf9a7eb..16a8ffd0fb881e47410e2b672e0922fb958a7d6d 100644 (file)
--- a/testing/tests/tkm/multiple-clients/pretest.dat
+++ b/testing/tests/tkm/multiple-clients/pretest.dat
@@ -1,7 +1,7 @@
 sun::rm /etc/ipsec.secrets
 sun::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 sun::cat /etc/ipsec.conf
-sun::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/sunKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+sun::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/sunKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 sun::expect-file /tmp/tkm.rpc.ike
 sun::DAEMON_NAME=charon-tkm ipsec start
 carol::ipsec start

diff --git a/testing/tests/tkm/net2net-initiator/pretest.dat b/testing/tests/tkm/net2net-initiator/pretest.dat
index f84c8fcd279bce9cf3296cb6630c33a1ade7d2b5..e30b3b1b9bf6855f488371abf9f80e17f908fec3 100644 (file)
--- a/testing/tests/tkm/net2net-initiator/pretest.dat
+++ b/testing/tests/tkm/net2net-initiator/pretest.dat
@@ -1,7 +1,7 @@
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 sun::ipsec start

diff --git a/testing/tests/tkm/net2net-xfrmproxy/pretest.dat b/testing/tests/tkm/net2net-xfrmproxy/pretest.dat
index 4732a37f60bbe54e1134ca820a08ddd5d298fbc9..d022155a79cf340c8847d2c7bf02bf830e404a8c 100644 (file)
--- a/testing/tests/tkm/net2net-xfrmproxy/pretest.dat
+++ b/testing/tests/tkm/net2net-xfrmproxy/pretest.dat
@@ -2,7 +2,7 @@ sun::ipsec start
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 moon::expect-file /tmp/tkm.rpc.ees

diff --git a/testing/tests/tkm/xfrmproxy-expire/pretest.dat b/testing/tests/tkm/xfrmproxy-expire/pretest.dat
index d645ddbfe9c568e1566e56081c32f5da43049dfc..9d2d2580c1ae7ed4bb68161b597b384447e39b93 100644 (file)
--- a/testing/tests/tkm/xfrmproxy-expire/pretest.dat
+++ b/testing/tests/tkm/xfrmproxy-expire/pretest.dat
@@ -2,7 +2,7 @@ sun::ipsec start
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 moon::expect-file /tmp/tkm.rpc.ees

diff --git a/testing/tests/tkm/xfrmproxy-rekey/pretest.dat b/testing/tests/tkm/xfrmproxy-rekey/pretest.dat
index d645ddbfe9c568e1566e56081c32f5da43049dfc..9d2d2580c1ae7ed4bb68161b597b384447e39b93 100644 (file)
--- a/testing/tests/tkm/xfrmproxy-rekey/pretest.dat
+++ b/testing/tests/tkm/xfrmproxy-rekey/pretest.dat
@@ -2,7 +2,7 @@ sun::ipsec start
 moon::rm /etc/ipsec.secrets
 moon::tkm_cfgtool -c /etc/tkm/tkm.conf -i /etc/ipsec.conf -t /etc/tkm/tkm.bin -s /usr/local/share/tkm/tkmconfig.xsd
 moon::cat /etc/ipsec.conf
-moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der >/tmp/tkm.log 2>&1 &
+moon::tkm_keymanager -c /etc/tkm/tkm.bin -k /etc/tkm/moonKey.der -r /etc/tkm/strongswanCert.der:1 >/tmp/tkm.log 2>&1 &
 moon::expect-file /tmp/tkm.rpc.ike
 moon::DAEMON_NAME=charon-tkm ipsec start
 moon::expect-file /tmp/tkm.rpc.ees