From c1343b3278cdf99533b7902744d15969f9d6fdc1 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Wed, 2 Jan 2013 14:18:20 +0100 Subject: Imported Upstream version 5.0.1 --- .../tests/ikev1/rw-psk-rsa-mixed/description.txt | 5 ----- testing/tests/ikev1/rw-psk-rsa-mixed/evaltest.dat | 7 ------ .../rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf | 23 ------------------- .../rw-psk-rsa-mixed/hosts/carol/etc/ipsec.secrets | 7 ------ .../rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf | 26 ---------------------- .../rw-psk-rsa-mixed/hosts/moon/etc/ipsec.secrets | 5 ----- testing/tests/ikev1/rw-psk-rsa-mixed/posttest.dat | 3 --- testing/tests/ikev1/rw-psk-rsa-mixed/pretest.dat | 7 ------ testing/tests/ikev1/rw-psk-rsa-mixed/test.conf | 21 ----------------- 9 files changed, 104 deletions(-) delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/description.txt delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/evaltest.dat delete mode 100755 testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.secrets delete mode 100755 testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.secrets delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/posttest.dat delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/pretest.dat delete mode 100644 testing/tests/ikev1/rw-psk-rsa-mixed/test.conf (limited to 'testing/tests/ikev1/rw-psk-rsa-mixed') diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/description.txt b/testing/tests/ikev1/rw-psk-rsa-mixed/description.txt deleted file mode 100644 index b99a8e5b3..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/description.txt +++ /dev/null @@ -1,5 +0,0 @@ -The roadwarriors carol and dave each set up a connection to gateway moon. -carol's authentication is based on a Pre-Shared Key (PSK) whereas dave's -is based on an RSA signature (RSASIG). Gateway moon supports both authentication modes -and automatically selects the correct roadwarrior connection definition based on policy -information gained from pre-parsing the peers' ISAKMP proposal payload. diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/evaltest.dat b/testing/tests/ikev1/rw-psk-rsa-mixed/evaltest.dat deleted file mode 100644 index 5ab6632cc..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/evaltest.dat +++ /dev/null @@ -1,7 +0,0 @@ -carol::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES -dave::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES -moon::cat /var/log/auth.log::peer requests PSK authentication::YES -moon::ipsec status::rw-psk.*PH_IP_CAROL STATE_QUICK_R2.*IPsec SA established::YES -moon::cat /var/log/auth.log::peer requests PUBKEY authentication::YES -moon::ipsec status::rw-rsasig.*PH_IP_DAVE STATE_QUICK_R2.*IPsec SA established::YES - diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf deleted file mode 100755 index f2a15af0a..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - plutodebug=control - charonstart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev1 - ike=aes128,serpent128,twofish128,3des - -conn home - authby=secret - left=PH_IP_CAROL - leftid=carol@strongswan.org - leftfirewall=yes - right=PH_IP_MOON - rightid=@moon.strongswan.org - rightsubnet=10.1.0.0/16 - auto=add diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.secrets deleted file mode 100644 index 1b721dc58..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.secrets +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/ipsec.secrets - strongSwan IPsec secrets file - -: PSK 0sv+NkxY9LLZvwj4qCC2o/gGrWDF2d21jL - - - - diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf deleted file mode 100755 index 02270e004..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf +++ /dev/null @@ -1,26 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - plutodebug=control - charonstart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev1 - left=PH_IP_MOON - leftid=@moon.strongswan.org - leftsubnet=10.1.0.0/16 - leftfirewall=yes - right=%any - -conn rw-rsasig - authby=rsasig - leftcert=moonCert.pem - auto=add - -conn rw-psk - authby=secret - auto=add diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.secrets deleted file mode 100644 index fd33507a7..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.secrets +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/ipsec.secrets - strongSwan IPsec secrets file - -: PSK 0sv+NkxY9LLZvwj4qCC2o/gGrWDF2d21jL - -: RSA moonKey.pem diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/posttest.dat b/testing/tests/ikev1/rw-psk-rsa-mixed/posttest.dat deleted file mode 100644 index ed530f6d9..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/posttest.dat +++ /dev/null @@ -1,3 +0,0 @@ -moon::ipsec stop -carol::ipsec stop -dave::ipsec stop diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/pretest.dat b/testing/tests/ikev1/rw-psk-rsa-mixed/pretest.dat deleted file mode 100644 index 35797b589..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/pretest.dat +++ /dev/null @@ -1,7 +0,0 @@ -carol::rm /etc/ipsec.d/cacerts/* -carol::ipsec start -dave::ipsec start -moon::ipsec start -carol::sleep 2 -carol::ipsec up home -dave::ipsec up home diff --git a/testing/tests/ikev1/rw-psk-rsa-mixed/test.conf b/testing/tests/ikev1/rw-psk-rsa-mixed/test.conf deleted file mode 100644 index 699b88e88..000000000 --- a/testing/tests/ikev1/rw-psk-rsa-mixed/test.conf +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# This configuration file provides information on the -# UML instances used for this test - -# All UML instances that are required for this test -# -UMLHOSTS="moon carol dave winnetou" - -# Corresponding block diagram -# -DIAGRAM="a-m-c-w-d.png" - -# UML instances on which tcpdump is to be started -# -TCPDUMPHOSTS="" - -# UML instances on which IPsec is started -# Used for IPsec logging purposes -# -IPSECHOSTS="moon carol dave" -- cgit v1.2.3