From patchwork Sat Sep 24 20:53:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: michael-dev X-Patchwork-Id: 674414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3shNZ50qwvz9s5g for ; Sun, 25 Sep 2016 07:25:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bnuRz-0002gL-C3; Sat, 24 Sep 2016 21:25:35 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bnuPh-0007b6-JW for hostap@bombadil.infradead.org; Sat, 24 Sep 2016 21:23:13 +0000 Received: from mail.fem.tu-ilmenau.de ([141.24.220.54]) by merlin.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bnu30-0000zz-0A for hostap@lists.infradead.org; Sat, 24 Sep 2016 20:59:46 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.fem.tu-ilmenau.de (Postfix) with ESMTP id 2968B6913; Sat, 24 Sep 2016 22:54:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at fem.tu-ilmenau.de Received: from mail.fem.tu-ilmenau.de ([127.0.0.1]) by localhost (mail.fem.tu-ilmenau.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hMCmbJvdx9-f; Sat, 24 Sep 2016 22:54:18 +0200 (CEST) Received: from mail-backup.fem.tu-ilmenau.de (mail-backup.net.fem.tu-ilmenau.de [10.42.40.22]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.fem.tu-ilmenau.de (Postfix) with ESMTPS; Sat, 24 Sep 2016 22:54:17 +0200 (CEST) Received: from a234.fem.tu-ilmenau.de (ray-controller.net.fem.tu-ilmenau.de [10.42.51.234]) by mail-backup.fem.tu-ilmenau.de (Postfix) with ESMTP id E220055130; Sat, 24 Sep 2016 22:54:17 +0200 (CEST) Received: by a234.fem.tu-ilmenau.de (Postfix, from userid 1000) id CAA1F306ACA3; Sat, 24 Sep 2016 22:54:17 +0200 (CEST) From: Michael Braun To: hostap@lists.infradead.org Subject: [PATCH v2 05/33] test: FT with broadcasts Date: Sat, 24 Sep 2016 22:53:46 +0200 Message-Id: <1474750454-6626-6-git-send-email-michael-dev@fami-braun.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1474750454-6626-1-git-send-email-michael-dev@fami-braun.de> References: <1474750454-6626-1-git-send-email-michael-dev@fami-braun.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160924_165946_263680_3D099DBC X-CRM114-Status: UNSURE ( 6.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [141.24.220.54 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: projekt-wlan@fem.tu-ilmenau.de, Michael Braun MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Michael Braun --- tests/hwsim/test_ap_ft.py | 49 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py index 419038c..5070f17 100644 --- a/tests/hwsim/test_ap_ft.py +++ b/tests/hwsim/test_ap_ft.py @@ -52,11 +52,15 @@ def ft_params1a(rsn=True, ssid=None, passphrase=None): params['r1_key_holder'] = "000102030405" return params -def ft_params1(rsn=True, ssid=None, passphrase=None): +def ft_params1(rsn=True, ssid=None, passphrase=None, discovery=False): params = ft_params1a(rsn, ssid, passphrase) - params['r0kh'] = [ "02:00:00:00:03:00 nas1.w1.fi 100102030405060708090a0b0c0d0e0f", - "02:00:00:00:04:00 nas2.w1.fi 300102030405060708090a0b0c0d0e0f" ] - params['r1kh'] = "02:00:00:00:04:00 00:01:02:03:04:06 200102030405060708090a0b0c0d0e0f" + if discovery: + params['r0kh'] = "ff:ff:ff:ff:ff:ff * 100102030405060708090a0b0c0d0e0f" + params['r1kh'] = "00:00:00:00:00:00 00:00:00:00:00:00 100102030405060708090a0b0c0d0e0f" + else: + params['r0kh'] = [ "02:00:00:00:03:00 nas1.w1.fi 100102030405060708090a0b0c0d0e0f", + "02:00:00:00:04:00 nas2.w1.fi 300102030405060708090a0b0c0d0e0f" ] + params['r1kh'] = "02:00:00:00:04:00 00:01:02:03:04:06 200102030405060708090a0b0c0d0e0f" return params def ft_params2a(rsn=True, ssid=None, passphrase=None): @@ -65,11 +69,15 @@ def ft_params2a(rsn=True, ssid=None, passphrase=None): params['r1_key_holder'] = "000102030406" return params -def ft_params2(rsn=True, ssid=None, passphrase=None): +def ft_params2(rsn=True, ssid=None, passphrase=None, discovery=False): params = ft_params2a(rsn, ssid, passphrase) - params['r0kh'] = [ "02:00:00:00:03:00 nas1.w1.fi 200102030405060708090a0b0c0d0e0f", - "02:00:00:00:04:00 nas2.w1.fi 000102030405060708090a0b0c0d0e0f" ] - params['r1kh'] = "02:00:00:00:03:00 00:01:02:03:04:05 300102030405060708090a0b0c0d0e0f" + if discovery: + params['r0kh'] = "ff:ff:ff:ff:ff:ff * 100102030405060708090a0b0c0d0e0f" + params['r1kh'] = "00:00:00:00:00:00 00:00:00:00:00:00 100102030405060708090a0b0c0d0e0f" + else: + params['r0kh'] = [ "02:00:00:00:03:00 nas1.w1.fi 200102030405060708090a0b0c0d0e0f", + "02:00:00:00:04:00 nas2.w1.fi 000102030405060708090a0b0c0d0e0f" ] + params['r1kh'] = "02:00:00:00:03:00 00:01:02:03:04:05 300102030405060708090a0b0c0d0e0f" return params def ft_params1_r0kh_mismatch(rsn=True, ssid=None, passphrase=None): @@ -435,13 +443,12 @@ def test_ap_ft_sae_over_ds(dev, apdev): run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, sae=True, over_ds=True) -def test_ap_ft_eap(dev, apdev): - """WPA2-EAP-FT AP""" +def generic_ap_ft_eap(dev, apdev, over_ds=False, discovery=False, roams=1): ssid = "test-ft" passphrase="12345678" radius = hostapd.radius_params() - params = ft_params1(ssid=ssid, passphrase=passphrase) + params = ft_params1(ssid=ssid, passphrase=passphrase, discovery=discovery) params['wpa_key_mgmt'] = "FT-EAP" params["ieee8021x"] = "1" params = dict(radius.items() + params.items()) @@ -449,13 +456,13 @@ def test_ap_ft_eap(dev, apdev): key_mgmt = hapd.get_config()['key_mgmt'] if key_mgmt.split(' ')[0] != "FT-EAP": raise Exception("Unexpected GET_CONFIG(key_mgmt): " + key_mgmt) - params = ft_params2(ssid=ssid, passphrase=passphrase) + params = ft_params2(ssid=ssid, passphrase=passphrase, discovery=discovery) params['wpa_key_mgmt'] = "FT-EAP" params["ieee8021x"] = "1" params = dict(radius.items() + params.items()) hapd1 = hostapd.add_ap(apdev[1], params) - run_roams(dev[0], apdev, hapd, hapd1, ssid, passphrase, eap=True) + run_roams(dev[0], apdev, hapd, hapd1, ssid, passphrase, eap=True, over_ds=over_ds, roams=roams) if "[WPA2-FT/EAP-CCMP]" not in dev[0].request("SCAN_RESULTS"): raise Exception("Scan results missing RSN element info") check_mib(dev[0], [ ("dot11RSNAAuthenticationSuiteRequested", "00-0f-ac-3"), @@ -476,6 +483,22 @@ def test_ap_ft_eap(dev, apdev): time.sleep(0.1) hwsim_utils.test_connectivity(dev[0], ap) +def test_ap_ft_eap(dev, apdev): + """WPA2-EAP-FT AP""" + generic_ap_ft_eap(dev, apdev) + +def test_ap_ft_eap_over_ds(dev, apdev): + """WPA2-EAP-FT AP w over_ds""" + generic_ap_ft_eap(dev, apdev, over_ds=True) + +def test_ap_ft_eap_dis(dev, apdev): + """WPA2-EAP-FT AP w discovery""" + generic_ap_ft_eap(dev, apdev, discovery=True) + +def test_ap_ft_eap_dis_over_ds(dev, apdev): + """WPA2-EAP-FT AP w discovery + over_ds""" + generic_ap_ft_eap(dev, apdev, over_ds=True, discovery=True) + def test_ap_ft_eap_pull(dev, apdev): """WPA2-EAP-FT AP (pull PMK)""" ssid = "test-ft"