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 --- testing/tests/sql/multi-level-ca/hosts/carol/etc/ipsec.conf | 1 - testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf | 2 +- testing/tests/sql/multi-level-ca/hosts/dave/etc/ipsec.conf | 1 - testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf | 2 +- testing/tests/sql/multi-level-ca/hosts/moon/etc/ipsec.conf | 3 +-- testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) mode change 100755 => 100644 testing/tests/sql/multi-level-ca/hosts/carol/etc/ipsec.conf mode change 100755 => 100644 testing/tests/sql/multi-level-ca/hosts/dave/etc/ipsec.conf (limited to 'testing/tests/sql/multi-level-ca/hosts') diff --git a/testing/tests/sql/multi-level-ca/hosts/carol/etc/ipsec.conf b/testing/tests/sql/multi-level-ca/hosts/carol/etc/ipsec.conf old mode 100755 new mode 100644 index 96eb832ae..d77a4c0c9 --- a/testing/tests/sql/multi-level-ca/hosts/carol/etc/ipsec.conf +++ b/testing/tests/sql/multi-level-ca/hosts/carol/etc/ipsec.conf @@ -2,6 +2,5 @@ config setup strictcrlpolicy=yes - plutostart=no # configuration is read from SQLite database diff --git a/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf b/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf index ee9fbbc66..930b72578 100644 --- a/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf +++ b/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf @@ -6,5 +6,5 @@ charon { database = sqlite:///etc/ipsec.d/ipsec.db } } - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql + load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql } diff --git a/testing/tests/sql/multi-level-ca/hosts/dave/etc/ipsec.conf b/testing/tests/sql/multi-level-ca/hosts/dave/etc/ipsec.conf old mode 100755 new mode 100644 index 96eb832ae..d77a4c0c9 --- a/testing/tests/sql/multi-level-ca/hosts/dave/etc/ipsec.conf +++ b/testing/tests/sql/multi-level-ca/hosts/dave/etc/ipsec.conf @@ -2,6 +2,5 @@ config setup strictcrlpolicy=yes - plutostart=no # configuration is read from SQLite database diff --git a/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf b/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf index ee9fbbc66..930b72578 100644 --- a/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf +++ b/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf @@ -6,5 +6,5 @@ charon { database = sqlite:///etc/ipsec.d/ipsec.db } } - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql + load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql } diff --git a/testing/tests/sql/multi-level-ca/hosts/moon/etc/ipsec.conf b/testing/tests/sql/multi-level-ca/hosts/moon/etc/ipsec.conf index 96eb832ae..296ed1e93 100644 --- a/testing/tests/sql/multi-level-ca/hosts/moon/etc/ipsec.conf +++ b/testing/tests/sql/multi-level-ca/hosts/moon/etc/ipsec.conf @@ -1,7 +1,6 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - strictcrlpolicy=yes - plutostart=no + strictcrlpolicy=yes # configuration is read from SQLite database diff --git a/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf b/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf index ee9fbbc66..930b72578 100644 --- a/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf +++ b/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf @@ -6,5 +6,5 @@ charon { database = sqlite:///etc/ipsec.d/ipsec.db } } - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql + load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql } -- cgit v1.2.3