testing: Fixed ikev2/alg-chacha20poly1305 scenario

diff --git a/testing/tests/ikev2/alg-chacha20poly1305/description.txt b/testing/tests/ikev2/alg-chacha20poly1305/description.txt
index dd8918b686c39acb1d686a3a07df6b9c948535ae..a808c4b67edc82b5814513d56f4cc4eb7f27fc5a 100644 (file)
--- a/testing/tests/ikev2/alg-chacha20poly1305/description.txt
+++ b/testing/tests/ikev2/alg-chacha20poly1305/description.txt
@@ -1,5 +1,5 @@
 Roadwarrior <b>carol</b> proposes to gateway <b>moon</b> the cipher suite
-<b>CHACHA20_POLY1305_256</b> both for IKE and ESP by defining
+<b>CHACHA20_POLY1305</b> both for IKE and ESP by defining
 <b>ike=chacha20poly1305-prfsha256-ntru256</b> and
 <b>esp=chacha20poly1305-ntru256</b> in ipsec.conf, respectively.
 A ping from <b>carol</b> to <b>alice</b> successfully checks the established tunnel.

diff --git a/testing/tests/ikev2/alg-chacha20poly1305/evaltest.dat b/testing/tests/ikev2/alg-chacha20poly1305/evaltest.dat
index ab54ce153d3c33af1cf78d342411fe4c95af769b..ac29c66ff0a13fcf36b1862e65db569528ec65fa 100644 (file)
--- a/testing/tests/ikev2/alg-chacha20poly1305/evaltest.dat
+++ b/testing/tests/ikev2/alg-chacha20poly1305/evaltest.dat
@@ -3,10 +3,10 @@ carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*moon.
 moon:: ipsec status 2> /dev/null::rw.*INSTALLED, TUNNEL::YES
 carol::ipsec status 2> /dev/null::home.*INSTALLED, TUNNEL::YES
 carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_.eq=1::YES
-moon:: ipsec statusall 2> /dev/null::IKE proposal: CHACHA20_POLY1305_256::YES
-carol::ipsec statusall 2> /dev/null::IKE proposal: CHACHA20_POLY1305_256::YES
-moon:: ipsec statusall 2> /dev/null::CHACHA20_POLY1305_256,::YES
-carol::ipsec statusall 2> /dev/null::CHACHA20_POLY1305_256,::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: CHACHA20_POLY1305::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: CHACHA20_POLY1305::YES
+moon:: ipsec statusall 2> /dev/null::CHACHA20_POLY1305,::YES
+carol::ipsec statusall 2> /dev/null::CHACHA20_POLY1305,::YES
 moon:: ip xfrm state::aead rfc7539esp(chacha20,poly1305)::YES
 carol::ip xfrm state::aead rfc7539esp(chacha20,poly1305)::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 184::YES