Updated to hostap_2_6

[mech_eap.git] / libeap / tests / hwsim / test_peerkey.py

diff --git a/libeap/tests/hwsim/test_peerkey.py b/libeap/tests/hwsim/test_peerkey.py
index aac4473..6f9b716 100644 (file)
--- a/libeap/tests/hwsim/test_peerkey.py
+++ b/libeap/tests/hwsim/test_peerkey.py
@@ -4,6 +4,7 @@
 # This software may be distributed under the terms of the BSD license.
 # See README for more details.
 
+from remotehost import remote_compatible
 import logging
 logger = logging.getLogger()
 import time
@@ -13,13 +14,14 @@ import hostapd
 from utils import skip_with_fips
 from wlantest import Wlantest
 
+@remote_compatible
 def test_peerkey(dev, apdev):
     """RSN AP and PeerKey between two STAs"""
     ssid = "test-peerkey"
     passphrase = "12345678"
     params = hostapd.wpa2_params(ssid=ssid, passphrase=passphrase)
     params['peerkey'] = "1"
-    hostapd.add_ap(apdev[0]['ifname'], params)
+    hostapd.add_ap(apdev[0], params)
 
     dev[0].connect(ssid, psk=passphrase, scan_freq="2412", peerkey=True)
     dev[1].connect(ssid, psk=passphrase, scan_freq="2412", peerkey=True)
@@ -38,7 +40,7 @@ def test_peerkey_unknown_peer(dev, apdev):
     passphrase = "12345678"
     params = hostapd.wpa2_params(ssid=ssid, passphrase=passphrase)
     params['peerkey'] = "1"
-    hostapd.add_ap(apdev[0]['ifname'], params)
+    hostapd.add_ap(apdev[0], params)
 
     dev[0].connect(ssid, psk=passphrase, scan_freq="2412", peerkey=True)
     dev[1].connect(ssid, psk=passphrase, scan_freq="2412", peerkey=True)
@@ -47,18 +49,21 @@ def test_peerkey_unknown_peer(dev, apdev):
     dev[0].request("STKSTART " + dev[2].p2p_interface_addr())
     time.sleep(0.5)
 
+@remote_compatible
 def test_peerkey_pairwise_mismatch(dev, apdev):
     """RSN TKIP+CCMP AP and PeerKey between two STAs using different ciphers"""
     skip_with_fips(dev[0])
-    wt = Wlantest()
-    wt.flush()
-    wt.add_passphrase("12345678")
     ssid = "test-peerkey"
     passphrase = "12345678"
     params = hostapd.wpa2_params(ssid=ssid, passphrase=passphrase)
     params['peerkey'] = "1"
     params['rsn_pairwise'] = "TKIP CCMP"
-    hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.add_ap(apdev[0], params)
+
+    Wlantest.setup(hapd)
+    wt = Wlantest()
+    wt.flush()
+    wt.add_passphrase("12345678")
 
     dev[0].connect(ssid, psk=passphrase, scan_freq="2412", peerkey=True,
                    pairwise="CCMP")