testing: Use 384-bit Blowfish for ESP on carol to show off variable key lengths

diff --git a/testing/tests/ikev1/alg-blowfish/evaltest.dat b/testing/tests/ikev1/alg-blowfish/evaltest.dat
index cd83c56b4b9fd34e5c7ddb50f7bf0c462000c65b..ab00c3bc137849a180c1619c963080b9317b2669 100644 (file)
--- a/testing/tests/ikev1/alg-blowfish/evaltest.dat
+++ b/testing/tests/ikev1/alg-blowfish/evaltest.dat
@@ -6,9 +6,9 @@ carol::ipsec statusall 2> /dev/null::IKE proposal: BLOWFISH_CBC_256/HMAC_SHA2_51
 dave:: ipsec statusall 2> /dev/null::IKE proposal: BLOWFISH_CBC_128/HMAC_SHA2_256_128::YES
 carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_req=1::YES
 dave:: ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_req=1::YES
-carol::ipsec statusall 2> /dev/null::BLOWFISH_CBC_192/HMAC_SHA2_384_192,::YES
+carol::ipsec statusall 2> /dev/null::BLOWFISH_CBC_384/HMAC_SHA2_384_192,::YES
 dave:: ipsec statusall 2> /dev/null::BLOWFISH_CBC_128/HMAC_SHA2_256_128,::YES
-carol::ip -s xfrm state::enc cbc(blowfish).*(192 bits)::YES
+carol::ip -s xfrm state::enc cbc(blowfish).*(384 bits)::YES
 dave:: ip -s xfrm state::enc cbc(blowfish).*(128 bits)::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 192::YES
 moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 192::YES

diff --git a/testing/tests/ikev1/alg-blowfish/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/alg-blowfish/hosts/carol/etc/ipsec.conf
index db409be435109bab87fb93e6347b055f5751813c..be458a308dbdd812c414e67227681f83033641d7 100644 (file)
--- a/testing/tests/ikev1/alg-blowfish/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/alg-blowfish/hosts/carol/etc/ipsec.conf
@@ -9,7 +9,7 @@ conn %default
        keyingtries=1
        keyexchange=ikev1
        ike=blowfish256-sha512-modp2048!
-       esp=blowfish192-sha384!
+       esp=blowfish384-sha384!
 
 conn home
        left=PH_IP_CAROL

diff --git a/testing/tests/ikev1/alg-blowfish/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/alg-blowfish/hosts/moon/etc/ipsec.conf
index f3c84ece891f3a0a875979619790347546a6d5ad..585f39e53cb39734fe9f29ae47437be0e1afebb9 100644 (file)
--- a/testing/tests/ikev1/alg-blowfish/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/alg-blowfish/hosts/moon/etc/ipsec.conf
@@ -9,7 +9,7 @@ conn %default
        keyingtries=1
        keyexchange=ikev1
        ike=blowfish256-sha512-modp2048,blowfish128-sha256-modp1536!
-       esp=blowfish192-sha384,blowfish128-sha256!
+       esp=blowfish384-sha384,blowfish128-sha256!
 
 conn rw
        left=PH_IP_MOON

diff --git a/testing/tests/ikev2/alg-blowfish/evaltest.dat b/testing/tests/ikev2/alg-blowfish/evaltest.dat
index f76522c5c9643d57a4f68d355f9f0c63e45a8ffc..fdba0bba538b99c4700b60ffb02fb4ffda29324a 100644 (file)
--- a/testing/tests/ikev2/alg-blowfish/evaltest.dat
+++ b/testing/tests/ikev2/alg-blowfish/evaltest.dat
@@ -6,9 +6,9 @@ carol::ipsec statusall 2> /dev/null::IKE proposal: BLOWFISH_CBC_256/HMAC_SHA2_51
 dave:: ipsec statusall 2> /dev/null::IKE proposal: BLOWFISH_CBC_128/HMAC_SHA2_256_128::YES
 carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_req=1::YES
 dave:: ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_req=1::YES
-carol::ipsec statusall 2> /dev/null::BLOWFISH_CBC_192/HMAC_SHA2_256_128,::YES
+carol::ipsec statusall 2> /dev/null::BLOWFISH_CBC_384/HMAC_SHA2_256_128,::YES
 dave:: ipsec statusall 2> /dev/null::BLOWFISH_CBC_128/HMAC_SHA1_96,::YES
-carol::ip -s xfrm state::enc cbc(blowfish).*(192 bits)::YES
+carol::ip -s xfrm state::enc cbc(blowfish).*(384 bits)::YES
 dave:: ip -s xfrm state::enc cbc(blowfish).*(128 bits)::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 184::YES
 moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 184::YES

diff --git a/testing/tests/ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf
index 89674b2a1a722949b54ccfa25586cce66dc78ba9..3df8c97bd00c612f8761a5c86fc0df3d589ce2cf 100644 (file)
--- a/testing/tests/ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf
@@ -10,7 +10,7 @@ conn %default
        keyingtries=1
        keyexchange=ikev2
        ike=blowfish256-sha512-modp2048!
-       esp=blowfish192-sha256!
+       esp=blowfish384-sha256!
 
 conn home
        left=PH_IP_CAROL

diff --git a/testing/tests/ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf
index 82804a0fe3860f632bced20f8a47ba508b741b8c..fb84a9b162d277e971a93d7802ae6a098391555c 100644 (file)
--- a/testing/tests/ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf
@@ -10,7 +10,7 @@ conn %default
        keyingtries=1
        keyexchange=ikev2
        ike=blowfish256-sha512-modp2048,blowfish128-sha256-modp1536!
-       esp=blowfish192-sha256,blowfish128-sha1!
+       esp=blowfish384-sha256,blowfish128-sha1!
 
 conn rw
        left=PH_IP_MOON