From eccca505aaf478100bcaed8ce1584b079d1da116 Mon Sep 17 00:00:00 2001 From: Adrian-Ken Rueegsegger Date: Fri, 25 Sep 2020 18:36:34 +0200 Subject: [PATCH] testing: Use multi-CA aware TKM Also add CA ID to tkm_keymanager command. --- testing/scripts/recipes/010_tkm.mk | 2 +- testing/tests/tkm/host2host-initiator/pretest.dat | 2 +- testing/tests/tkm/host2host-responder/pretest.dat | 2 +- testing/tests/tkm/host2host-xfrmproxy/pretest.dat | 2 +- testing/tests/tkm/multiple-clients/pretest.dat | 2 +- testing/tests/tkm/net2net-initiator/pretest.dat | 2 +- testing/tests/tkm/net2net-xfrmproxy/pretest.dat | 2 +- testing/tests/tkm/xfrmproxy-expire/pretest.dat | 2 +- testing/tests/tkm/xfrmproxy-rekey/pretest.dat | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk index a999ef83f..4d8af638a 100644 --- 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 7cb90ac26..6be277737 100644 --- 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 40e84453f..9f8c7be1f 100644 --- 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 d645ddbfe..9d2d2580c 100644 --- 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 ec83662f5..16a8ffd0f 100644 --- 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 f84c8fcd2..e30b3b1b9 100644 --- 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 4732a37f6..d022155a7 100644 --- 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 d645ddbfe..9d2d2580c 100644 --- 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 d645ddbfe..9d2d2580c 100644 --- 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 -- 2.47.3