Rearrange EAP setup so that it is more parameterizable for other EAP types

server/site_tests/network_WiFiSecMat/019CheckWPA_1x_AES

Index: server/site_tests/network_WiFiSecMat/019CheckWPA_1x_AES
diff --git a/server/site_tests/network_WiFiSecMat/019CheckWPA_1x_AES b/server/site_tests/network_WiFiSecMat/019CheckWPA_1x_AES
index 3bb13ae69a61b76b222470e63c63bf71aeb1f5ae..5b28585c612588143c689ec316e997893134d7df 100644
--- a/server/site_tests/network_WiFiSecMat/019CheckWPA_1x_AES
+++ b/server/site_tests/network_WiFiSecMat/019CheckWPA_1x_AES
@@ -14,30 +14,30 @@
     [ "config",         { "channel":"2412", "mode":"11g",
                           "wpa":"1", "wpa_key_mgmt":"WPA-EAP",
                           "wpa_pairwise":"CCMP", "ieee8021x":"1",
-                          "eap-tls":"cert1" } ],
-    [ "connect",        { "security":"802_1x", "eap-tls":"cert1" } ],
+                          "eap":"tls1" } ],
+    [ "connect",        { "security":"802_1x", "eap":"tls1" } ],
     [ "client_ping",    { "count":"10" } ],
     [ "disconnect" ],
 
     [ "restart_supplicant" ],
     [ "config",         { "ssid_suffix":"t1" } ],
-    [ "connect",        { "security":"802_1x", "eap-tls":"cert1",
-                          "server-auth":"cert1" } ],
+    [ "connect",        { "security":"802_1x", "eap":"tls1",
+                          "server-auth":"tls1" } ],
     [ "client_ping",    { "count":"10" } ],
     [ "disconnect" ],
 
     # Ensure authentication fails if server's cert doesn't match our CA cert
     [ "restart_supplicant" ],
     [ "config",         { "ssid_suffix":"t2" } ],
-    [ "!connect",       { "security":"802_1x", "eap-tls":"cert1",
-                          "server-auth":"cert2" },
+    [ "!connect",       { "security":"802_1x", "eap":"tls1",
+                          "server-auth":"tls2" },
                           "TLS: Certificate verification failed"],
 
     # Try authenticating using the wrong client certiificate
     [ "restart_supplicant" ],
     [ "config",         { "ssid_suffix":"t3" } ],
-    [ "!connect",       { "security":"802_1x", "eap-tls":"cert2",
-                          "server-auth":"cert1" },
+    [ "!connect",       { "security":"802_1x", "eap":"tls2",
+                          "server-auth":"tls1" },
                           "SSL: SSL3 alert: read "
                           "\(remote end reported an error\):fatal:unknown CA" ],
     [ "disconnect" ],