From 8318d884501606a1dbc82871bbde96ecf71aa636 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Sun, 29 Aug 2010 20:24:12 +0200 Subject: [PATCH] replaced ikev2/esp-alg-aes-ccm by ikev2/alg-aes-ccm --- testing/tests/ikev2/alg-aes-ccm/description.txt | 4 ++++ .../ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/evaltest.dat | 8 +++++--- .../hosts/carol/etc/ipsec.conf | 2 +- .../moon => alg-aes-ccm/hosts/carol}/etc/strongswan.conf | 2 +- .../hosts/moon/etc/ipsec.conf | 2 +- .../carol => alg-aes-ccm/hosts/moon}/etc/strongswan.conf | 2 +- .../ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/posttest.dat | 0 .../ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/pretest.dat | 0 .../ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/test.conf | 0 testing/tests/ikev2/esp-alg-aes-ccm/description.txt | 4 ---- 10 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 testing/tests/ikev2/alg-aes-ccm/description.txt rename testing/tests/ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/evaltest.dat (68%) rename testing/tests/ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/hosts/carol/etc/ipsec.conf (92%) rename testing/tests/ikev2/{esp-alg-aes-ccm/hosts/moon => alg-aes-ccm/hosts/carol}/etc/strongswan.conf (66%) rename testing/tests/ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/hosts/moon/etc/ipsec.conf (91%) rename testing/tests/ikev2/{esp-alg-aes-ccm/hosts/carol => alg-aes-ccm/hosts/moon}/etc/strongswan.conf (66%) rename testing/tests/ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/posttest.dat (100%) rename testing/tests/ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/pretest.dat (100%) rename testing/tests/ikev2/{esp-alg-aes-ccm => alg-aes-ccm}/test.conf (100%) delete mode 100644 testing/tests/ikev2/esp-alg-aes-ccm/description.txt diff --git a/testing/tests/ikev2/alg-aes-ccm/description.txt b/testing/tests/ikev2/alg-aes-ccm/description.txt new file mode 100644 index 000000000..28e38ca7f --- /dev/null +++ b/testing/tests/ikev2/alg-aes-ccm/description.txt @@ -0,0 +1,4 @@ +Roadwarrior carol proposes to gateway moon the cipher suite +AES_CCM_12_128 both for IKE and ESP by defining ike=aes128ccm12-aesxcbc-modp2048 +(or alternatively aes128ccm96) and esp=aes128ccm12-modp2048 in ipsec.conf, respectively. +A ping from carol to alice successfully checks the established tunnel. diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/evaltest.dat b/testing/tests/ikev2/alg-aes-ccm/evaltest.dat similarity index 68% rename from testing/tests/ikev2/esp-alg-aes-ccm/evaltest.dat rename to testing/tests/ikev2/alg-aes-ccm/evaltest.dat index f7959d129..0834a8db0 100644 --- a/testing/tests/ikev2/esp-alg-aes-ccm/evaltest.dat +++ b/testing/tests/ikev2/alg-aes-ccm/evaltest.dat @@ -1,9 +1,11 @@ moon::ipsec statusall::rw.*INSTALLED::YES carol::ipsec statusall::home.*INSTALLED::YES carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES -moon::ipsec statusall::AES_CCM_12_128::YES -carol::ipsec statusall::AES_CCM_12_128::YES -carol::ip xfrm state::aead rfc4309(ccm(aes))::YES +moon::ipsec statusall::IKE proposal: AES_CCM_12_128::YES +carol::ipsec statusall::IKE proposal: AES_CCM_12_128::YES +moon::ipsec statusall::AES_CCM_12_128,::YES +carol::ipsec statusall::AES_CCM_12_128,::YES moon::ip xfrm state::aead rfc4309(ccm(aes))::YES +carol::ip xfrm state::aead rfc4309(ccm(aes))::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 180::YES moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 180::YES diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/ipsec.conf similarity index 92% rename from testing/tests/ikev2/esp-alg-aes-ccm/hosts/carol/etc/ipsec.conf rename to testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/ipsec.conf index 85c825002..6bcfbc28d 100755 --- a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/carol/etc/ipsec.conf +++ b/testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/ipsec.conf @@ -11,7 +11,7 @@ conn %default rekeymargin=3m keyingtries=1 keyexchange=ikev2 - ike=aes128-aesxcbc-modp2048! + ike=aes128ccm96-aesxcbc-modp2048! esp=aes128ccm96-modp2048! conn home diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/strongswan.conf similarity index 66% rename from testing/tests/ikev2/esp-alg-aes-ccm/hosts/moon/etc/strongswan.conf rename to testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/strongswan.conf index 339b56987..db2c09bae 100644 --- a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/moon/etc/strongswan.conf +++ b/testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/strongswan.conf @@ -1,5 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default updown + load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc ccm stroke kernel-netlink socket-default updown } diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/ipsec.conf similarity index 91% rename from testing/tests/ikev2/esp-alg-aes-ccm/hosts/moon/etc/ipsec.conf rename to testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/ipsec.conf index 8f8404516..1d6f13861 100755 --- a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/ipsec.conf @@ -11,7 +11,7 @@ conn %default rekeymargin=3m keyingtries=1 keyexchange=ikev2 - ike=aes128-aesxcbc-modp2048! + ike=aes128ccm12-aesxcbc-modp2048! esp=aes128ccm12-modp2048! conn rw diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/strongswan.conf similarity index 66% rename from testing/tests/ikev2/esp-alg-aes-ccm/hosts/carol/etc/strongswan.conf rename to testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/strongswan.conf index 339b56987..db2c09bae 100644 --- a/testing/tests/ikev2/esp-alg-aes-ccm/hosts/carol/etc/strongswan.conf +++ b/testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/strongswan.conf @@ -1,5 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default updown + load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc ccm stroke kernel-netlink socket-default updown } diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/posttest.dat b/testing/tests/ikev2/alg-aes-ccm/posttest.dat similarity index 100% rename from testing/tests/ikev2/esp-alg-aes-ccm/posttest.dat rename to testing/tests/ikev2/alg-aes-ccm/posttest.dat diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/pretest.dat b/testing/tests/ikev2/alg-aes-ccm/pretest.dat similarity index 100% rename from testing/tests/ikev2/esp-alg-aes-ccm/pretest.dat rename to testing/tests/ikev2/alg-aes-ccm/pretest.dat diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/test.conf b/testing/tests/ikev2/alg-aes-ccm/test.conf similarity index 100% rename from testing/tests/ikev2/esp-alg-aes-ccm/test.conf rename to testing/tests/ikev2/alg-aes-ccm/test.conf diff --git a/testing/tests/ikev2/esp-alg-aes-ccm/description.txt b/testing/tests/ikev2/esp-alg-aes-ccm/description.txt deleted file mode 100644 index 9fe03b010..000000000 --- a/testing/tests/ikev2/esp-alg-aes-ccm/description.txt +++ /dev/null @@ -1,4 +0,0 @@ -Roadwarrior carol proposes to gateway moon the ESP cipher suite -AES_CCM_12_128 by defining esp=aes128ccm12-modp2048 or alternatively -esp=aes128ccm96-modp2048 in ipsec.conf. -A ping from carol to alice successfully checks the established tunnel.