From 1bc8690f5425e5833aac268d27fe90b749e8d9d4 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Sun, 29 Aug 2010 21:52:08 +0200 Subject: [PATCH] replaced ikev2/esp-alg-aes-ctr by ikev2/alg-aes-ctr --- testing/tests/ikev2/alg-aes-ctr/description.txt | 4 ++++ .../ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/evaltest.dat | 6 ++++-- .../hosts/carol/etc/ipsec.conf | 2 +- .../moon => alg-aes-ctr/hosts/carol}/etc/strongswan.conf | 2 +- .../hosts/moon/etc/ipsec.conf | 2 +- .../carol => alg-aes-ctr/hosts/moon}/etc/strongswan.conf | 2 +- .../ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/posttest.dat | 0 .../ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/pretest.dat | 0 .../tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/test.conf | 0 testing/tests/ikev2/esp-alg-aes-ctr/description.txt | 3 --- 10 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 testing/tests/ikev2/alg-aes-ctr/description.txt rename testing/tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/evaltest.dat (66%) rename testing/tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/hosts/carol/etc/ipsec.conf (93%) rename testing/tests/ikev2/{esp-alg-aes-ctr/hosts/moon => alg-aes-ctr/hosts/carol}/etc/strongswan.conf (66%) rename testing/tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/hosts/moon/etc/ipsec.conf (92%) rename testing/tests/ikev2/{esp-alg-aes-ctr/hosts/carol => alg-aes-ctr/hosts/moon}/etc/strongswan.conf (66%) rename testing/tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/posttest.dat (100%) rename testing/tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/pretest.dat (100%) rename testing/tests/ikev2/{esp-alg-aes-ctr => alg-aes-ctr}/test.conf (100%) delete mode 100644 testing/tests/ikev2/esp-alg-aes-ctr/description.txt diff --git a/testing/tests/ikev2/alg-aes-ctr/description.txt b/testing/tests/ikev2/alg-aes-ctr/description.txt new file mode 100644 index 0000000000..edb601b613 --- /dev/null +++ b/testing/tests/ikev2/alg-aes-ctr/description.txt @@ -0,0 +1,4 @@ +Roadwarrior carol proposes to gateway moon the cipher suite +AES_CTR_128 both for IKE and ESP by defining ike=aes128ctr-aesxcbc-modp2048 +and esp=aes128ctr-aesxcbc-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-ctr/evaltest.dat b/testing/tests/ikev2/alg-aes-ctr/evaltest.dat similarity index 66% rename from testing/tests/ikev2/esp-alg-aes-ctr/evaltest.dat rename to testing/tests/ikev2/alg-aes-ctr/evaltest.dat index 6b5d0ba0b6..522ce60888 100644 --- a/testing/tests/ikev2/esp-alg-aes-ctr/evaltest.dat +++ b/testing/tests/ikev2/alg-aes-ctr/evaltest.dat @@ -1,8 +1,10 @@ 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_CTR_128/AES_XCBC_96::YES -carol::ipsec statusall::AES_CTR_128/AES_XCBC_96::YES +moon::ipsec statusall::IKE proposal: AES_CTR_128::YES +carol::ipsec statusall::IKE proposal: AES_CTR_128::YES +moon::ipsec statusall::AES_CTR_128/AES_XCBC_96,::YES +carol::ipsec statusall::AES_CTR_128/AES_XCBC_96,::YES moon::ip xfrm state::rfc3686(ctr(aes))::YES carol::ip xfrm state::rfc3686(ctr(aes))::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 180::YES diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/alg-aes-ctr/hosts/carol/etc/ipsec.conf similarity index 93% rename from testing/tests/ikev2/esp-alg-aes-ctr/hosts/carol/etc/ipsec.conf rename to testing/tests/ikev2/alg-aes-ctr/hosts/carol/etc/ipsec.conf index 02ca66b75a..70c4828355 100755 --- a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/carol/etc/ipsec.conf +++ b/testing/tests/ikev2/alg-aes-ctr/hosts/carol/etc/ipsec.conf @@ -11,7 +11,7 @@ conn %default rekeymargin=3m keyingtries=1 keyexchange=ikev2 - ike=aes128-aesxcbc-modp2048! + ike=aes128ctr-aesxcbc-modp2048! esp=aes128ctr-aesxcbc-modp2048! conn home diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/alg-aes-ctr/hosts/carol/etc/strongswan.conf similarity index 66% rename from testing/tests/ikev2/esp-alg-aes-ctr/hosts/moon/etc/strongswan.conf rename to testing/tests/ikev2/alg-aes-ctr/hosts/carol/etc/strongswan.conf index 339b56987a..be46d6d3ec 100644 --- a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/moon/etc/strongswan.conf +++ b/testing/tests/ikev2/alg-aes-ctr/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 ctr stroke kernel-netlink socket-default updown } diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/alg-aes-ctr/hosts/moon/etc/ipsec.conf similarity index 92% rename from testing/tests/ikev2/esp-alg-aes-ctr/hosts/moon/etc/ipsec.conf rename to testing/tests/ikev2/alg-aes-ctr/hosts/moon/etc/ipsec.conf index 1c19714b91..bf103742f0 100755 --- a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2/alg-aes-ctr/hosts/moon/etc/ipsec.conf @@ -11,7 +11,7 @@ conn %default rekeymargin=3m keyingtries=1 keyexchange=ikev2 - ike=aes128-aesxcbc-modp2048! + ike=aes128ctr-aesxcbc-modp2048! esp=aes128ctr-aesxcbc-modp2048! conn rw diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/alg-aes-ctr/hosts/moon/etc/strongswan.conf similarity index 66% rename from testing/tests/ikev2/esp-alg-aes-ctr/hosts/carol/etc/strongswan.conf rename to testing/tests/ikev2/alg-aes-ctr/hosts/moon/etc/strongswan.conf index 339b56987a..be46d6d3ec 100644 --- a/testing/tests/ikev2/esp-alg-aes-ctr/hosts/carol/etc/strongswan.conf +++ b/testing/tests/ikev2/alg-aes-ctr/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 ctr stroke kernel-netlink socket-default updown } diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/posttest.dat b/testing/tests/ikev2/alg-aes-ctr/posttest.dat similarity index 100% rename from testing/tests/ikev2/esp-alg-aes-ctr/posttest.dat rename to testing/tests/ikev2/alg-aes-ctr/posttest.dat diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/pretest.dat b/testing/tests/ikev2/alg-aes-ctr/pretest.dat similarity index 100% rename from testing/tests/ikev2/esp-alg-aes-ctr/pretest.dat rename to testing/tests/ikev2/alg-aes-ctr/pretest.dat diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/test.conf b/testing/tests/ikev2/alg-aes-ctr/test.conf similarity index 100% rename from testing/tests/ikev2/esp-alg-aes-ctr/test.conf rename to testing/tests/ikev2/alg-aes-ctr/test.conf diff --git a/testing/tests/ikev2/esp-alg-aes-ctr/description.txt b/testing/tests/ikev2/esp-alg-aes-ctr/description.txt deleted file mode 100644 index 6443a348f8..0000000000 --- a/testing/tests/ikev2/esp-alg-aes-ctr/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -Roadwarrior carol proposes to gateway moon the ESP cipher suite -AES_CTR_128 / AES_XCBC_96 by defining esp=aes128ctr-aesxcbc-modp2048 in ipsec.conf. -A ping from carol to alice successfully checks the established tunnel. -- 2.47.3