the ikev1 scenarios need the x509 plugin

configure.in

@@ -586,6 +586,7 @@ if test x$random = xtrue; then
 fi
 if test x$x509 = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" x509"
+	pluto_plugins=${pluto_plugins}" x509"
 fi
 if test x$pubkey = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" pubkey"

testing/hosts/alice/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/hosts/bob/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/hosts/sun/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/hosts/venus/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 gcrypt hmac curl
+  load = pem pkcs1 x509 gcrypt hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 gcrypt hmac curl
+  load = pem pkcs1 x509 gcrypt hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 gcrypt hmac curl
+  load = pem pkcs1 x509 gcrypt hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 gcrypt hmac curl
+  load = pem pkcs1 x509 gcrypt hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors pem pkcs1 gcrypt hmac curl
+  load = test-vectors pem pkcs1 x509 gcrypt hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/rw-cert/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random hmac curl
+  load = test-vectors aes des sha1 sha2 md5 pem pkcs1 x509 gmp random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/gcrypt-ikev1/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors pem pkcs1 gcrypt hmac curl
+  load = test-vectors pem pkcs1 x509 gcrypt hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ike/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ike/rw-cert/hosts/moon/etc/strongswan.conf

@@ -5,7 +5,7 @@ charon {
 }
 
 pluto {
-  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random hmac
+  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 x509 gmp random hmac
 }
 
 libstrongswan {

testing/tests/ike/rw_v1-net_v2/hosts/moon/etc/strongswan.conf

@@ -5,5 +5,5 @@ charon {
 }
 
 pluto {
-  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random hmac
+  load = curl aes des sha1 sha2 md5 pem pkcs1 x509 gmp random hmac
 }

testing/tests/ikev1/alg-blowfish/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des blowfish hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des blowfish hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/alg-blowfish/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des blowfish hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des blowfish hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/attr-cert/hosts/moon/etc/strongswan.conf

@@ -1,9 +1,9 @@
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 openac {
-  load = sha1 sha2 md5 pem pkcs1 gmp random x509
+  load = sha1 sha2 md5 pem pkcs1 x509 gmp random x509
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/crl-ldap/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl ldap
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/crl-ldap/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl ldap
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/default-keys/hosts/carol/etc/strongswan.conf

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/default-keys/hosts/moon/etc/strongswan.conf

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/mode-config/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
   dns1 = PH_IP_WINNETOU
   dns2 = PH_IP6_VENUS
 }

testing/tests/ikev1/multi-level-ca-ldap/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl ldap
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/multi-level-ca-ldap/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl ldap
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/multi-level-ca-ldap/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl ldap
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/net2net-rsa/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac dnskey pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac dnskey pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/net2net-rsa/hosts/sun/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac dnskey pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac dnskey pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/req-pkcs10/hosts/carol/etc/strongswan.conf

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/req-pkcs10/hosts/moon/etc/strongswan.conf

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 x509 x509 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/self-signed/hosts/carol/etc/strongswan.conf

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/self-signed/hosts/moon/etc/strongswan.conf

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 openssl random hmac curl
+  load = pem pkcs1 x509 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = aes des sha1 sha2 md5 pem pkcs1 gmp pem pkcs1 openssl random hmac curl
+  load = aes des sha1 sha2 md5 pem pkcs1 x509 gmp pem pkcs1 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 openssl random hmac curl
+  load = pem pkcs1 x509 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 openssl random hmac curl 
+  load = pem pkcs1 x509 openssl random hmac curl 
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = aes des sha1 sha2 md5 pem pkcs1 gmp pem pkcs1 openssl random hmac curl
+  load = aes des sha1 sha2 md5 pem pkcs1 x509 gmp pem pkcs1 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 openssl random hmac curl 
+  load = pem pkcs1 x509 openssl random hmac curl 
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 openssl random hmac curl
+  load = pem pkcs1 x509 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = aes des sha1 sha2 md5 pem pkcs1 gmp pem pkcs1 openssl random hmac curl
+  load = aes des sha1 sha2 md5 pem pkcs1 x509 gmp pem pkcs1 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 openssl random hmac curl
+  load = pem pkcs1 x509 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors pem pkcs1 openssl random hmac curl
+  load = test-vectors pem pkcs1 x509 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random hmac curl
+  load = test-vectors aes des sha1 sha2 md5 pem pkcs1 x509 gmp random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = test-vectors pem pkcs1 openssl random hmac curl
+  load = test-vectors pem pkcs1 x509 openssl random hmac curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)