Streamlined EAP plugins to use a dash between eap-method, as used in all other places

testing/tests/sql/rw-eap-aka-rsa/evaltest.dat

@@ -1,7 +1,7 @@
 carol::cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with RSA signature successful::YES
 carol::cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
 moon::cat /var/log/daemon.log::authentication of '[email protected]' with EAP successful::YES
-moon::ipsec statusall::rw-eapaka.*ESTABLISHED::YES
+moon::ipsec statusall::rw-eap-aka.*ESTABLISHED::YES
 carol::ipsec statusall::home.*ESTABLISHED::YES
 carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES

testing/tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf

@@ -3,8 +3,8 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/ipsec.d/ipsec.db
     }
   }
-  load = curl aes des sha1 sha2 md5 fips-prf pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown sqlite sql eapaka eapaka-3gpp2
+  load = curl aes des sha1 sha2 md5 fips-prf pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown sqlite sql eap-aka eap-aka-3gpp2
 }

testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql

@@ -98,20 +98,20 @@ INSERT INTO private_key_identity (
 
 INSERT INTO shared_secrets (
   type, data
-) VALUES ( 
+) VALUES (
   2, X'4172336574546e703031716c704f6762'
 );
 
 INSERT INTO shared_secret_identity (
   shared_secret, identity
 ) VALUES (
-  1, 3 
+  1, 3
 );
 
 INSERT INTO shared_secret_identity (
   shared_secret, identity
 ) VALUES (
-  1, 6 
+  1, 6
 );
 
 /* Configurations */
@@ -125,13 +125,13 @@ INSERT INTO ike_configs (
 INSERT INTO peer_configs (
   name, ike_cfg, local_id, remote_id, eap_type
 ) VALUES (
-  'rw-eapaka', 1, 3, 5, 23
+  'rw-eap-aka', 1, 3, 5, 23
 );
 
 INSERT INTO child_configs (
   name, updown
 ) VALUES (
-  'rw-eapaka', 'ipsec _updown iptables'
+  'rw-eap-aka', 'ipsec _updown iptables'
 );
 
 INSERT INTO peer_config_child_config (

testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf

@@ -3,8 +3,8 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/ipsec.d/ipsec.db
     }
   }
-  load = aes des sha1 sha2 md5 fips-prf pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown sqlite sql eapaka eapaka-3gpp2
+  load = aes des sha1 sha2 md5 fips-prf pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown sqlite sql eap-aka eap-aka-3gpp2
 }