tests load pem/pkcs1 plugins, pubkey plugin not needed anymore

testing/hosts/alice/etc/strongswan.conf

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

testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl gcrypt x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl pem pkcs1 gcrypt x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl gcrypt x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl pem pkcs1 gcrypt x509 hmac xcbc stroke kernel-netlink updown
 }

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

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors gcrypt x509 pubkey hmac stroke kernel-netlink updown
+  load = curl test-vectors pem pkcs1 gcrypt x509 hmac stroke kernel-netlink updown
 }
 
 libstrongswan {

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

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac stroke kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac stroke kernel-netlink updown
 }
 
 libstrongswan {

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

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors gcrypt x509 pubkey hmac stroke kernel-netlink updown
+  load = curl test-vectors pem pkcs1 gcrypt x509 hmac stroke kernel-netlink updown
 }
 
 libstrongswan {

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 gmp pubkey random curl
+  load = test-vectors sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

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

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }
 
 libstrongswan {

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

@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors aes des sha1 sha2 md5 gmp random pubkey hmac x509 xcbc stroke kernel-netlink
+  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random hmac x509 xcbc stroke kernel-netlink
 }
 
 pluto {
-  load = curl test-vectors aes des sha1 sha2 md5 gmp random pubkey hmac
+  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random hmac
 }
 
 libstrongswan {

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

@@ -1,9 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random pubkey hmac x509 xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random hmac x509 xcbc stroke kernel-netlink
 }
 
 pluto {
-  load = curl aes des sha1 sha2 md5 gmp random pubkey hmac
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random hmac
 }

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

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

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 gmp pubkey random curl
+  load = sha1 sha2 md5 aes des blowfish hmac pem pkcs1 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 gmp pubkey random curl
+  load = sha1 sha2 md5 aes des blowfish hmac pem pkcs1 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 gmp pubkey random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
 }
 
 openac {
-  load = sha1 sha2 md5 gmp random x509 pubkey
+  load = sha1 sha2 md5 pem pkcs1 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 gmp pubkey random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac gmp pubkey random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac gmp pubkey random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 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 gmp pubkey random curl ldap
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random curl ldap
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/nat-two-rw-psk/hosts/alice/etc/strongswan.conf

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

testing/tests/ikev1/nat-two-rw-psk/hosts/sun/etc/strongswan.conf

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

testing/tests/ikev1/nat-two-rw-psk/hosts/venus/etc/strongswan.conf

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

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

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

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

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

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

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

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

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

testing/tests/ikev1/rw-psk-fqdn-named/hosts/carol/etc/strongswan.conf

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

testing/tests/ikev1/rw-psk-fqdn-named/hosts/moon/etc/strongswan.conf

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

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

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

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

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

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

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

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

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

testing/tests/ikev1/rw-psk-no-policy/hosts/carol/etc/strongswan.conf

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

testing/tests/ikev1/rw-psk-no-policy/hosts/moon/etc/strongswan.conf

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

testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/strongswan.conf

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

testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/strongswan.conf

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

testing/tests/ikev1/xauth-psk-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 gmp random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)

testing/tests/ikev1/xauth-psk/hosts/carol/etc/strongswan.conf

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

testing/tests/ikev1/xauth-psk/hosts/dave/etc/strongswan.conf

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

testing/tests/ikev1/xauth-psk/hosts/moon/etc/strongswan.conf

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

testing/tests/ikev2/after-2038-certs/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/after-2038-certs/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/alg-aes-xcbc/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/alg-aes-xcbc/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

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

@@ -2,5 +2,5 @@
 
 charon {
   dh_exponent_ansi_x9_42 = no
-  load = aes des blowfish md5 sha1 sha2 gmp curl random x509 pubkey hmac stroke kernel-netlink updown
+  load = aes des blowfish md5 sha1 sha2 pem pkcs1 gmp curl random x509 hmac stroke kernel-netlink updown
 }

testing/tests/ikev2/alg-blowfish/hosts/dave/etc/strongswan.conf

@@ -2,5 +2,5 @@
 
 charon {
   dh_exponent_ansi_x9_42 = no
-  load = aes des blowfish md5 sha1 sha2 gmp curl random x509 pubkey hmac stroke kernel-netlink updown
+  load = aes des blowfish md5 sha1 sha2 pem pkcs1 gmp curl random x509 hmac stroke kernel-netlink updown
 }

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

@@ -2,5 +2,5 @@
 
 charon {
   dh_exponent_ansi_x9_42 = no
-  load = aes des blowfish md5 sha1 sha2 gmp curl random x509 pubkey hmac stroke kernel-netlink updown
+  load = aes des blowfish md5 sha1 sha2 pem pkcs1 gmp curl random x509 hmac stroke kernel-netlink updown
 }

testing/tests/ikev2/any-interface/hosts/alice/etc/strongswan.conf

@@ -1,6 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
   multiple_authentication = no
 }

testing/tests/ikev2/any-interface/hosts/bob/etc/strongswan.conf

@@ -1,6 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
   multiple_authentication = no
 }

testing/tests/ikev2/any-interface/hosts/moon/etc/strongswan.conf

@@ -1,6 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
   multiple_authentication = no
 }

testing/tests/ikev2/any-interface/hosts/sun/etc/strongswan.conf

@@ -1,6 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
   multiple_authentication = no
 }

testing/tests/ikev2/compress/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/compress/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/config-payload-swapped/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/config-payload-swapped/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/config-payload-swapped/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/config-payload/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown resolv-conf
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown resolv-conf
 }

testing/tests/ikev2/config-payload/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown resolv-conf
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown resolv-conf
 }

testing/tests/ikev2/config-payload/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown attr
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown attr
   dns1 = PH_IP_WINNETOU
   dns2 = PH_IP_VENUS
 }

testing/tests/ikev2/crl-from-cache/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/crl-from-cache/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

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

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = ldap aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = ldap aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

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

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = ldap aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = ldap aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/crl-revoked/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/crl-revoked/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/crl-to-cache/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/crl-to-cache/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

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

@@ -1,9 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac gmp pubkey random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
 }

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

@@ -1,9 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }
 
 scepclient {
-  load = sha1 sha2 md5 aes des hmac gmp pubkey random
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 gmp random
 }

testing/tests/ikev2/double-nat-net/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/double-nat-net/hosts/bob/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/double-nat/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/double-nat/hosts/bob/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/dpd-clear/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/dpd-clear/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/dpd-hold/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

testing/tests/ikev2/dpd-hold/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink
 }

testing/tests/ikev2/dpd-restart/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }