merged multi-auth branch back into trunk

testing/tests/ikev2/rw-eap-sim-id-radius/description.txt

@@ -9,5 +9,5 @@ are used instead of a physical SIM card on the client <b>carol</b> and
 the gateway forwards all EAP messages to the RADIUS server <b>alice</b>
 which also uses static triplets. In addition to her IKEv2 identity
 <b>[email protected]</b>, roadwarrior <b>carol</b> uses the EAP
-identity <b>232420100000015</b>.
+identity <b>228060123456001</b>.
 

testing/tests/ikev2/rw-eap-sim-id-radius/evaltest.dat

@@ -1,6 +1,6 @@
 carol::cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with RSA signature successful::YES
-moon::cat /var/log/daemon.log::using EAP identity .*232420100000015::YES
-carol::cat /var/log/daemon.log::EAP server requested EAP_SIM authentication::YES
+moon::cat /var/log/daemon.log::received EAP identity .*228060123456001::YES
+carol::cat /var/log/daemon.log::server requested EAP_SIM authentication::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-eap.*ESTABLISHED::YES

testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/raddb/triplets.dat

@@ -1,3 +1,3 @@
-232420100000015,30000000000000000000000000000000,30112233,305566778899AABB
-232420100000015,31000000000000000000000000000000,31112233,315566778899AABB
-232420100000015,32000000000000000000000000000000,32112233,325566778899AABB
+228060123456001,30000000000000000000000000000000,30112233,305566778899AABB
+228060123456001,31000000000000000000000000000000,31112233,315566778899AABB
+228060123456001,32000000000000000000000000000000,32112233,325566778899AABB

testing/tests/ikev2/rw-eap-sim-id-radius/hosts/carol/etc/ipsec.conf

@@ -16,7 +16,7 @@ conn home
 	leftnexthop=%direct
 	[email protected]
 	leftfirewall=yes
-	eap_identity=232420100000015
+	eap_identity=228060123456001
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16