From 357894c692e8fb35864fc8ef037aeb63317b2a86 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Fri, 18 Mar 2011 09:54:59 +0100 Subject: [PATCH] af-alg plugin does not require hmac and xcbc plugins --- .../af-alg-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf | 2 +- .../af-alg-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf | 2 +- .../tests/af-alg-ikev1/rw-cert/hosts/carol/etc/strongswan.conf | 2 +- .../tests/af-alg-ikev1/rw-cert/hosts/moon/etc/strongswan.conf | 2 +- .../af-alg-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf | 2 +- .../af-alg-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf | 2 +- .../tests/af-alg-ikev2/rw-cert/hosts/carol/etc/strongswan.conf | 2 +- .../tests/af-alg-ikev2/rw-cert/hosts/moon/etc/strongswan.conf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testing/tests/af-alg-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/af-alg-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf index ff6296e51..04c2358ed 100644 --- a/testing/tests/af-alg-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf @@ -1,7 +1,7 @@ # /etc/strongswan.conf - strongSwan configuration file pluto { - load = pem pkcs1 x509 af-alg gmp random hmac curl kernel-netlink + load = pem pkcs1 x509 af-alg gmp random curl kernel-netlink } # pluto uses optimized DH exponent sizes (RFC 3526) diff --git a/testing/tests/af-alg-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/af-alg-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf index ff6296e51..04c2358ed 100644 --- a/testing/tests/af-alg-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf @@ -1,7 +1,7 @@ # /etc/strongswan.conf - strongSwan configuration file pluto { - load = pem pkcs1 x509 af-alg gmp random hmac curl kernel-netlink + load = pem pkcs1 x509 af-alg gmp random curl kernel-netlink } # pluto uses optimized DH exponent sizes (RFC 3526) diff --git a/testing/tests/af-alg-ikev1/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/af-alg-ikev1/rw-cert/hosts/carol/etc/strongswan.conf index 9a9cea87c..fd687c13a 100644 --- a/testing/tests/af-alg-ikev1/rw-cert/hosts/carol/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev1/rw-cert/hosts/carol/etc/strongswan.conf @@ -1,7 +1,7 @@ # /etc/strongswan.conf - strongSwan configuration file pluto { - load = test-vectors pem pkcs1 x509 af-alg gmp random hmac curl kernel-netlink + load = test-vectors pem pkcs1 x509 af-alg gmp random curl kernel-netlink } # pluto uses optimized DH exponent sizes (RFC 3526) diff --git a/testing/tests/af-alg-ikev1/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/af-alg-ikev1/rw-cert/hosts/moon/etc/strongswan.conf index 9a9cea87c..fd687c13a 100644 --- a/testing/tests/af-alg-ikev1/rw-cert/hosts/moon/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev1/rw-cert/hosts/moon/etc/strongswan.conf @@ -1,7 +1,7 @@ # /etc/strongswan.conf - strongSwan configuration file pluto { - load = test-vectors pem pkcs1 x509 af-alg gmp random hmac curl kernel-netlink + load = test-vectors pem pkcs1 x509 af-alg gmp random curl kernel-netlink } # pluto uses optimized DH exponent sizes (RFC 3526) diff --git a/testing/tests/af-alg-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/af-alg-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf index 72e23ba8b..3cd390829 100644 --- a/testing/tests/af-alg-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf @@ -1,5 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl pem pkcs1 af-alg gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default updown + load = curl pem pkcs1 af-alg gmp random x509 revocation stroke kernel-netlink socket-default updown } diff --git a/testing/tests/af-alg-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/af-alg-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf index 72e23ba8b..3cd390829 100644 --- a/testing/tests/af-alg-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf @@ -1,5 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl pem pkcs1 af-alg gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default updown + load = curl pem pkcs1 af-alg gmp random x509 revocation stroke kernel-netlink socket-default updown } diff --git a/testing/tests/af-alg-ikev2/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/af-alg-ikev2/rw-cert/hosts/carol/etc/strongswan.conf index efc151845..1c71b885f 100644 --- a/testing/tests/af-alg-ikev2/rw-cert/hosts/carol/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev2/rw-cert/hosts/carol/etc/strongswan.conf @@ -1,7 +1,7 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl test-vectors pem pkcs1 af-alg gmp random x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown + load = curl test-vectors pem pkcs1 af-alg gmp random x509 revocation ctr ccm gcm stroke kernel-netlink socket-default updown } libstrongswan { diff --git a/testing/tests/af-alg-ikev2/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/af-alg-ikev2/rw-cert/hosts/moon/etc/strongswan.conf index efc151845..1c71b885f 100644 --- a/testing/tests/af-alg-ikev2/rw-cert/hosts/moon/etc/strongswan.conf +++ b/testing/tests/af-alg-ikev2/rw-cert/hosts/moon/etc/strongswan.conf @@ -1,7 +1,7 @@ # /etc/strongswan.conf - strongSwan configuration file charon { - load = curl test-vectors pem pkcs1 af-alg gmp random x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown + load = curl test-vectors pem pkcs1 af-alg gmp random x509 revocation ctr ccm gcm stroke kernel-netlink socket-default updown } libstrongswan {