|
From: Jiri J. <jja...@re...> - 2013-10-07 11:31:20
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/trustedprograms/tests/test_ip_xfrm.bash | 29 ++++++++++++++++++++++
audit-test/trustedprograms/tests/test_ipsec.bash | 20 +++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/audit-test/trustedprograms/tests/test_ip_xfrm.bash b/audit-test/trustedprograms/tests/test_ip_xfrm.bash
index 18b09ea..9a225f6 100755
--- a/audit-test/trustedprograms/tests/test_ip_xfrm.bash
+++ b/audit-test/trustedprograms/tests/test_ip_xfrm.bash
@@ -202,6 +202,35 @@ function ipsec_remove_verify {
src=$ip_src dst=$ip_dst res=1 || exit_fail "missing audit record"
}
+#
+# ipsec_cleanup - Clean up / restore test-related environment
+#
+# INPUT
+# none
+#
+# OUTPUT
+# none
+
+function ipsec_cleanup {
+ # flush xfrm state
+ ip xfrm state flush
+ # reload default xfrm policy
+ if [ "$PASSWD" ]; then
+ expect -c "
+ spawn bash
+ expect {
+ \"]#\" { send -- \"run_init service ipsec restart\r\" }
+ }
+ expect {
+ -nocase password: { send -- \"$PASSWD\r\"; exp_continue }
+ \"]#\" { send -- \"exit\r\" }
+ }"
+ else
+ echo "warning: PASSWD not set, not reloading xfrm policy"
+ fi
+}
+append_cleanup 'ipsec_cleanup'
+
######################################################################
# main
######################################################################
diff --git a/audit-test/trustedprograms/tests/test_ipsec.bash b/audit-test/trustedprograms/tests/test_ipsec.bash
index 25541fd..3f35d1c 100755
--- a/audit-test/trustedprograms/tests/test_ipsec.bash
+++ b/audit-test/trustedprograms/tests/test_ipsec.bash
@@ -234,6 +234,26 @@ function ipsec_remove_verify {
exit_fail "missing audit record"
}
+#
+# ipsec_cleanup - Clean up / restore test-related environment
+#
+# INPUT
+# none
+#
+# OUTPUT
+# none
+
+function ipsec_cleanup {
+ # flush xfrm state
+ ip xfrm state flush
+ # flush remote xfrm state
+ if [ "$ip_dst" ]; then
+ tstsvr_cleanup "$ip_dst"
+ remote_ipsec_flush "$ip_dst"
+ fi
+}
+append_cleanup 'ipsec_cleanup'
+
######################################################################
# main
######################################################################
--
1.8.3.1
|