From 69090149464affcb6394b6d5bc3eaec0873ccd84 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Wed, 6 Nov 2019 14:22:02 +0000 Subject: [PATCH] examples/ipsec-secgw: fix library mode selection in tests Right now majority of lib mode functional tests enable library mode with '-w N' option. It worked till recently, as legacy mode didn't support replay window. Now it changed. To fix - use '-l' option to enable library mode explicitly. Fixes: 929784452094 ("examples/ipsec-secgw: add scripts for functional test") Signed-off-by: Konstantin Ananyev --- examples/ipsec-secgw/test/bypass_defs.sh | 2 +- examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh | 2 +- examples/ipsec-secgw/test/trs_3descbc_sha1_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aescbc_sha1_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aescbc_sha1_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aescbc_sha1_esn_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aesctr_sha1_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aesgcm_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aesgcm_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/trs_aesgcm_esn_defs.sh | 2 +- examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh | 2 +- examples/ipsec-secgw/test/tun_3descbc_sha1_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aescbc_sha1_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aescbc_sha1_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aescbc_sha1_esn_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aesctr_sha1_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aesgcm_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aesgcm_esn_atom_defs.sh | 2 +- examples/ipsec-secgw/test/tun_aesgcm_esn_defs.sh | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/ipsec-secgw/test/bypass_defs.sh b/examples/ipsec-secgw/test/bypass_defs.sh index 12a8a5aff7..d8d54833c6 100644 --- a/examples/ipsec-secgw/test/bypass_defs.sh +++ b/examples/ipsec-secgw/test/bypass_defs.sh @@ -28,7 +28,7 @@ EOF cat ${SGW_CFG_FILE} } -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh b/examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh index 31f94492fe..35c31dc77d 100644 --- a/examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh +++ b/examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_3descbc_sha1_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_atom_defs.sh b/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_atom_defs.sh index d7439ad15d..c640720de5 100644 --- a/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/trs_3descbc_sha1_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh b/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh index e4283f3ddf..7b62dcfbf9 100644 --- a/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh +++ b/examples/ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_3descbc_sha1_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_aescbc_sha1_defs.sh b/examples/ipsec-secgw/test/trs_aescbc_sha1_defs.sh index d68552fcec..ae20fa96db 100644 --- a/examples/ipsec-secgw/test/trs_aescbc_sha1_defs.sh +++ b/examples/ipsec-secgw/test/trs_aescbc_sha1_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_aescbc_sha1_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_atom_defs.sh b/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_atom_defs.sh index f16222e111..ee7c0a37f9 100644 --- a/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/trs_aescbc_sha1_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_defs.sh b/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_defs.sh index ce7c977a3a..5f8b0992ed 100644 --- a/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_defs.sh +++ b/examples/ipsec-secgw/test/trs_aescbc_sha1_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_aescbc_sha1_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh b/examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh index 73642f881e..5d569ec5fd 100644 --- a/examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh +++ b/examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_aesctr_sha1_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_atom_defs.sh b/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_atom_defs.sh index 17c81c2675..14066ffd48 100644 --- a/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/trs_aesctr_sha1_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh b/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh index e401a4bed9..05ed982549 100644 --- a/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh +++ b/examples/ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_aesctr_sha1_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_aesgcm_defs.sh b/examples/ipsec-secgw/test/trs_aesgcm_defs.sh index 8382d3d52b..ca872df337 100644 --- a/examples/ipsec-secgw/test/trs_aesgcm_defs.sh +++ b/examples/ipsec-secgw/test/trs_aesgcm_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_aesgcm_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/trs_aesgcm_esn_atom_defs.sh b/examples/ipsec-secgw/test/trs_aesgcm_esn_atom_defs.sh index 80d8d63b82..2d3ae057b5 100644 --- a/examples/ipsec-secgw/test/trs_aesgcm_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/trs_aesgcm_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/trs_aesgcm_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/trs_aesgcm_esn_defs.sh b/examples/ipsec-secgw/test/trs_aesgcm_esn_defs.sh index 94958d1994..d4cb108108 100644 --- a/examples/ipsec-secgw/test/trs_aesgcm_esn_defs.sh +++ b/examples/ipsec-secgw/test/trs_aesgcm_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/trs_aesgcm_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh b/examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh index 2bbe142929..63df5a4a40 100644 --- a/examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh +++ b/examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_3descbc_sha1_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_atom_defs.sh b/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_atom_defs.sh index 1d8e36cbdf..316331c149 100644 --- a/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/tun_3descbc_sha1_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh b/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh index 98349c7bc6..cded9289e1 100644 --- a/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh +++ b/examples/ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_3descbc_sha1_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_aescbc_sha1_defs.sh b/examples/ipsec-secgw/test/tun_aescbc_sha1_defs.sh index 18aade3a93..40607a76f8 100644 --- a/examples/ipsec-secgw/test/tun_aescbc_sha1_defs.sh +++ b/examples/ipsec-secgw/test/tun_aescbc_sha1_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_aescbc_sha1_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_atom_defs.sh b/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_atom_defs.sh index 6b4a82149a..d2b70ffe16 100644 --- a/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/tun_aescbc_sha1_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_defs.sh b/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_defs.sh index 28c1125d64..e95157e67a 100644 --- a/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_defs.sh +++ b/examples/ipsec-secgw/test/tun_aescbc_sha1_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_aescbc_sha1_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh b/examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh index 3710f897c6..1fee291659 100644 --- a/examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh +++ b/examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_aesctr_sha1_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_atom_defs.sh b/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_atom_defs.sh index 7dcfc32182..ba0506a23a 100644 --- a/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/tun_aesctr_sha1_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh b/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh index c3ce11da12..0dfe47b08a 100644 --- a/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh +++ b/examples/ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_aesctr_sha1_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_aesgcm_defs.sh b/examples/ipsec-secgw/test/tun_aesgcm_defs.sh index 8ae65321bc..b4be0596f9 100644 --- a/examples/ipsec-secgw/test/tun_aesgcm_defs.sh +++ b/examples/ipsec-secgw/test/tun_aesgcm_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_aesgcm_common_defs.sh -SGW_CMD_XPRM='-w 300' +SGW_CMD_XPRM='-w 300 -l' config_remote_xfrm() { diff --git a/examples/ipsec-secgw/test/tun_aesgcm_esn_atom_defs.sh b/examples/ipsec-secgw/test/tun_aesgcm_esn_atom_defs.sh index dab1460c88..79df9ee8c8 100644 --- a/examples/ipsec-secgw/test/tun_aesgcm_esn_atom_defs.sh +++ b/examples/ipsec-secgw/test/tun_aesgcm_esn_atom_defs.sh @@ -2,4 +2,4 @@ . ${DIR}/tun_aesgcm_esn_defs.sh -SGW_CMD_XPRM='-e -a -w 300' +SGW_CMD_XPRM='-e -a -w 300 -l' diff --git a/examples/ipsec-secgw/test/tun_aesgcm_esn_defs.sh b/examples/ipsec-secgw/test/tun_aesgcm_esn_defs.sh index 6062323496..3c374631df 100644 --- a/examples/ipsec-secgw/test/tun_aesgcm_esn_defs.sh +++ b/examples/ipsec-secgw/test/tun_aesgcm_esn_defs.sh @@ -2,7 +2,7 @@ . ${DIR}/tun_aesgcm_common_defs.sh -SGW_CMD_XPRM='-e -w 300' +SGW_CMD_XPRM='-e -w 300 -l' config_remote_xfrm() { -- 2.20.1