testing: Use multi-CA aware TKM
Also add CA ID to tkm_keymanager command.
This commit is contained in:
committed by
Tobias Brunner
parent
d6cf4a165b
commit
eccca505aa
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
PKG = tkm
|
PKG = tkm
|
||||||
SRC = https://git.codelabs.ch/git/$(PKG).git
|
SRC = https://git.codelabs.ch/git/$(PKG).git
|
||||||
REV = 53d224a7312124516aa6220743355c896be6345a
|
REV = 5320ec82f2221d9c4d5be106f6b90287bfb4acce
|
||||||
|
|
||||||
export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
|
export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
sun::ipsec start
|
sun::ipsec start
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
sun::ipsec start
|
sun::ipsec start
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ sun::ipsec start
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
moon::expect-file /tmp/tkm.rpc.ees
|
moon::expect-file /tmp/tkm.rpc.ees
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
sun::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
sun::DAEMON_NAME=charon-tkm ipsec start
|
sun::DAEMON_NAME=charon-tkm ipsec start
|
||||||
carol::ipsec start
|
carol::ipsec start
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
sun::ipsec start
|
sun::ipsec start
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ sun::ipsec start
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
moon::expect-file /tmp/tkm.rpc.ees
|
moon::expect-file /tmp/tkm.rpc.ees
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ sun::ipsec start
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
moon::expect-file /tmp/tkm.rpc.ees
|
moon::expect-file /tmp/tkm.rpc.ees
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ sun::ipsec start
|
|||||||
moon::rm /etc/ipsec.secrets
|
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::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::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::expect-file /tmp/tkm.rpc.ike
|
||||||
moon::DAEMON_NAME=charon-tkm ipsec start
|
moon::DAEMON_NAME=charon-tkm ipsec start
|
||||||
moon::expect-file /tmp/tkm.rpc.ees
|
moon::expect-file /tmp/tkm.rpc.ees
|
||||||
|
|||||||
Reference in New Issue
Block a user