From patchwork Wed Apr 18 04:54:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 899896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FD/3OtVH"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="mdd6PkUm"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40QqgX0zkJz9rxp for ; Wed, 18 Apr 2018 15:00:24 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lNcxoE/scMWA9b/0PS85Xrv9zItynIFkzNf5CrXnK7g=; b=FD/3OtVH1VLYG3 er4TliRWyhsGj9ITnBiWyzp65rJ7u4IaByvVfwekePqTtuIlzQ3wS6jT5MZXUp6Tibt41PxzhmZHI FetgXX8NRKtgieBuYiDUmqRN/DZySuM9jo50aGNSe/FaY96KYq25OxXLNiPq50HGLS3u+Dr22tDnS OUobpdixD3XcuZ/gjBLSZUqSifVX2tl/h0gCTe/YvuzrPW0KBAbAVuLiLUMfmIX0ZP/s2lGX7gG56 G7pwxjIKJh90n0XLr+P4VSzABnhhGB8A2n+ZEmGo5I4ixU8Riu5tGpbmN+GX+r2A6qHEtvXwh9WLD kjVbPY34ujjRaHOJGtcA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8fCa-0006IQ-Kb; Wed, 18 Apr 2018 05:00:16 +0000 Received: from mail-am5eur03on061a.outbound.protection.outlook.com ([2a01:111:f400:fe08::61a] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8P-00037A-9e for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IK7/Q/UlwqSatux6pkp21BV9z7AkRyuomp0USJ4dTb0=; b=mdd6PkUmow0AIhmYmdM7e0WJalQSLIkoifwrwNkkVC8T9qdziP9KEBNnZySTTXNqVDRBzb8bQDv77MUKAsB3tBkCJASo2xwBo1LuGacYG1Z/sqCdldEXGIy1THusMozODi8yRNSgGiE63lRypdGlWO4zza+pL2+YthQbTXuAxts= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:28 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 02/15] mesh: factor out rsn initialization Date: Tue, 17 Apr 2018 21:54:59 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:/85UOrfXAQ/3pBBRN5z4UQ4vdw1/wYqtWhyBHcGu+Cot8iHRQDLuZFyh1lqWm3wuQJ2WvQvSX4dF91+P7DPcL+FtyzWDOHUO6AOXo+PB4YYS0iqV8pWD68cRa1z/8En6t+D7GlwbkS6ykpMFNoFxgo1IkxKNVxIyzX6z2q9TBRL2+mX9xwJDVHpaHQcxhuvUVamCqnVJPwuPq+NzwkAoRGBrTk1FajHgZ4sEG8BYsk6bLtAAbh06QYs8ZHi58GFo; 25:wGagU1NfMAzXSfPQpYZdrrsdwrdD+ULgTA9eTFAH105r/dQUsGZW6QkeuslY5ZN4AzPqiK+wgvbZz5J90t3NBVXkcvKpRR3L9e5i2U+P/b9kvo2hhno2jDFJp+eehhTgTxdKcQ6WVkJlWp6Mx2/mOX4tUMiZUh3Io51tD0iwVUfq8oW1+Lz3ZUlFFz1yXnfA5gFS2zZasKImMTUYBmz6nkGPTRj3ZkEqmd92VmoMt3wTlFRjEuIMGzdN/1yPBOj4vgjXm5Js8iHY0nQLuSTLXFDKx8CPvLc7ehM6COEZNt3bqwKqN9oGtUUOG8cYMNV7LgvNPV3BSr2q7ohqGbAiJA==; 31:8w401xJnWqXqyJsLklZrBtsJnpKm6eZ0osRrc5DdW1x3QuYIJygwG//09zCT1Fu7N4O+NDO7ZekBUMxgaXTSP0wxbN6Rf0n1250IMovuOT/zjwXSQLnObiv4y988nvStx2PbLbnIhFPfybfR3tujP/ktt7raeApPNZUv2BWROazONHFmYuy8pB52QhePT3TEjL9+oYkAPmDpt27vvlFZ2Rw4JWg392K+EX8v8tHdHt4= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:KVBWgP44a1rPHe64vvBuCYJ4Ag+IMvLTgTzNdHl9HNTNGGF8xJ7Nkx+A2obE812zYMpElUAqNtG3NZUqHLVw/CZXZQAtIRioE/8qDWFfjzJtcpQ94I4FGGOdCCDSSNTexstMR6v1g6bAg2NB9HuyoCCYonIJOGbjEIaQg2yFitbCdFe2QAm0YWsXnyljS2p9XMqZtdKQqxMgEWJopyS7nhG1xzy3ioAj+LdC/NxX+vkpnKz/S8/fsUD8wpA0FKr/gjfB4VlP/ehzhP7C6WKokqpowTf7sVR3oPNaYDDzNMP8+N+J8Utq1zzEMnfdN9sm1khgoGNstFeDvRbC8pY9kA==; 4:ADEq5P7XPyluO8t24NQoxdk/TCRVdhgBgVL1Rudu8JXcK8jbDfJs7EPhVwfwnRMheCGsITVyjAhd+fMPtDBl+o6P6z+gvbty0H5HdsomHHVBcAiQpds+Piol6rToMMVIUyvu+/Tz7Q48M1JMmoKMNe3jUcGIqigBVMCzxTwxk4UYjtg0YPUkfhl0v6s4u80J+Y1TxrLs+X6bO+zvtX5vV3urhfbCKAIDyh2PjRtL/9uaHsxSxqXM6NZ5abeEjT0bwlWMzp3N62lB2fzeIKRj0ls3uR1OwPNtvRvYrlZjwRbcOAzeIhigibOtk0eeYd0I X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(51416003)(2361001)(478600001)(551544002)(52116002)(52396003)(2906002)(50226002)(2351001)(107886003)(53416004)(118296001)(2616005)(8676002)(53936002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(16810700005)(81166006)(446003)(6512007)(9686003)(4326008)(47776003)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(386003)(8936002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:nov; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:IvTF42Gbfd86QB7bYgvTijNoYW3/YmVr/lQlJZtol?= iwoKQhGrlDSMNA5FU960/qlAhlccujpI+2nGwxd7v21I2DosrjKdRDnffXe8MQNmrXOa6wZHna4AzXAMYCsakXLdk9nU57SICBOCyt7S2IrxhYMqbbO0GjgDV8xavAPaug965cUtgboKGEhmwTeb/m+35uahmDfBcOgtOFRWj+of07cLLcSuK4Ooc18lGP7jLaXZOKY/fPZsrdUmJAqrJtZyjmxcePfTAxO7PqYd35YiEgymRiFk5VXo71rS7GKmjRB+8FyVuxSYFlmHAJuBPtkmw+v2JZDHHBaiTOEJSd1R82Th2GcMiRuZZDYErFIvZcpv0GoQpNAyCkgWf6WCaJbjGQyQIsVMatCdIhkXv4wkuBFesZ4pCtXTPK7vGZUdsMCuEqpIJU0r7BP9ebUoxF9XxZZSdt5sdlDJyn4KqCswGoN48z/yDskTJ47cBcR+VtFxY/eZ7x1evn3oq/BFZtH2cq0TQfWDFxUqaZ3IzIhuq3qprwdIubX9ItPFbY/YF6v8XCTPb7bxoxDq3ZYn5HKv5hKO6h5YBP6YsRL2DTXG/qsYgeHK5QdAXWh2x+SEl7YkybPDHKi7JVcqGvYVdK+par+t1GZZMCWH5ugKDAhSQ28X5F9ymoTLdEmKKFY+3ItHAG+wNyXzXpCXTs9KqLSW8VwhPDCyM3tVZm6gjShmmsdB0Acc4UlaFnzYVyD0hL72NsZHSKUfdShQHyveeCNAt6DQBMXZugQfAcXHGimuTnZVBqpLAhyIC+gia8GJe1fSwKXOt8kn6RGThZ91YEmEIVWbPKHbGJ456rbhulDk7I8JoXBU0hfYyW51waEiNtc5F33n3V2kBVemZcDoKVRpkShgFGN+MNI1vlpNRUcKuD/59Llm6CgXl/paewDTZDTK5cn/xKe2dmWe4m+zaB56xDmoMgmU4PfY1kzgGfUCfjNyisLXGe0/DVjsI0xUkicBXh3t7wtUN0PrGW1+xln/tyRaCR12ZpO1SnHZkzbMvVReuJZX4kEKJUyzZ5fri1eyBxU764f2aG/8Lyqf9vvKIrKdSzFJRU00Yv3QrUs0DQQm61fY35fQTBIZDw4DtHByrMroMq+JHg4hYRuN8QzqXCcyWbSNHzw6HSHM0o9JnGJw9QjkgWX9DhVuykh97XVO0RIlQ83vJ3Wt7xkKpF4d6c20D6FDSYRrO2IpqMiXrMFVokHEeoAx3hcuzYgrK0= X-Microsoft-Antispam-Message-Info: 0w9Ar/9t3gU3cvPNzjjt27VErmxwERStXmD4VhP7odQSp0POc3aNVnA12ShdhFFBvuuChUncCr+n+7bbojQFq/DwGYpYyzfvMPIPyuF1mmJxZ8jI7Ub06LwToiyDbx02z4MvVcUf8+QZLy8ZPHcJGAahZSafhK7pGRRsbuovUzCXgFDHOIk+JYTYhF2Z0rwR X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:yhBmOgrG9/7gWVJIb+szMPc+2+3Bq4+zIWFy9W7FAW3U04Awbt+QxFw40QFjxSfA4wZx+Xv5ZBEEw720wx0LCjz+FrcLsPcpOSbiMw3mVpq2LkuQkmkkskx3sfncIce+ir1mgAaIlpJv6p7xkGym64myR6p/35EWjwGt/lwC3s4BHZhoSKDDSiFJZH5D+imVbQ+CBApYrqbhYxsJZ6WH07isqAeiOuh5kd5+1pVQ/pbQbzCU0MbSd1y0vmHQM5Q3emvIuMtWI2lGYTGcNoqbWYCqkD/0KAJE33FZOvcJ0VTORJiOQowd5Iy6tVukLog7b9U/ORzb5jeXw18ffpOCXlbj/CnSY+RDAr5IyFVkWdUpQWJMpsN9lC9TUDhdc5oveUuETEgQVArZPZP7pe0Wdm92ypGMik9KWYKp3D1WMnMiWlgj/0HOhtNJGnyJTA+359+u2gavKP9o0M5Wgq/t9w==; 5:KHq2b7gZ53OJ2FrakU+dmzVDtPPPFyFom2IAbZHikzoutMqyq9nFQg2sJH4wZTQvlYwoZ0xJXuPgozjK1tJvTHsY/iM7zis62FHv6T51bVjPUlogBkKELvdfCeeQEeiIsGKv2hG/aFQaZPIoQpmKYgkgwivwLrtCvnmNvabV40w=; 24:oKSavplkz8jbQntKD19IRr3ZiWVnWpYhrScF8qAoZQVseyr2P2uNFSdboA21ZmWIbVwIBmMrbNa+Ultn0pBT46AVdKI6wUAIeFMkS5XsUTw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:f4PCs+gTXleUMijdo5gu0+OTnCjQuIcZKSHmykIv9Ybub+cd4rzxtfwXBqYYAnuCISPaRkv5NbJkgle1YMOa8v+rbZx61F/cp/0VnF/roL7biAExZDNnUThZAWpWA/MorxqLW+tWsmeb2m5nWKiMGCTv51c7e4iUf7LgH5OFHHG3mulhyU65cbdSg/3FApUp+kfP+LpJQBj0Kpq/blWB+hRBrZRIV9zrMWNbBsiqcGQnsimBjiAdQsiW4AG89mei X-MS-Office365-Filtering-Correlation-Id: 3f0b7566-bb71-46dc-d27e-08d5a4e89b7e X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:28.4221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f0b7566-bb71-46dc-d27e-08d5a4e89b7e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215557_522838_DA35765E X-CRM114-Status: GOOD ( 12.28 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe08:0:0:0:61a listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh RSN initialization can be used in different phases if mesh initialization and mesh join don't happen in sequence such as DFS CAC is done in between, hence factor it out to help convering the case. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 84 ++++++++++++++++++++++++++++++--------------------- wpa_supplicant/mesh.h | 1 + 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 3f3461f..82283aa 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -147,6 +147,53 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s) +{ + struct hostapd_iface *ifmsh = wpa_s->ifmsh; + struct mesh_conf *mconf = wpa_s->ifmsh->mconf; + struct wpa_ssid *ssid = wpa_s->current_ssid; + struct hostapd_data *bss = ifmsh->bss[0]; + static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; + const char *password; + size_t len; + + if (mconf->security != MESH_CONF_SEC_NONE) { + password = ssid->sae_password; + if (!password) + password = ssid->passphrase; + if (!password) { + wpa_printf(MSG_ERROR, + "mesh: Passphrase for SAE not configured"); + return -1; + } + + bss->conf->wpa = ssid->proto; + bss->conf->wpa_key_mgmt = ssid->key_mgmt; + + if (wpa_s->conf->sae_groups && + wpa_s->conf->sae_groups[0] > 0) { + wpas_mesh_copy_groups(bss, wpa_s); + } else { + bss->conf->sae_groups = + os_memdup(default_groups, + sizeof(default_groups)); + if (!bss->conf->sae_groups) + return -1; + } + + len = os_strlen(password); + bss->conf->ssid.wpa_passphrase = + dup_binstr(password, len); + + wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); + if (!wpa_s->mesh_rsn) + return -1; + } + + return 0; +} + + static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, struct hostapd_freq_params *freq) @@ -156,9 +203,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct hostapd_config *conf; struct mesh_conf *mconf; int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 }; - static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; - const char *password; - size_t len; int rate_len; int frequency; @@ -291,38 +335,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (mconf->security != MESH_CONF_SEC_NONE) { - password = ssid->sae_password; - if (!password) - password = ssid->passphrase; - if (!password) { - wpa_printf(MSG_ERROR, - "mesh: Passphrase for SAE not configured"); - goto out_free; - } - - bss->conf->wpa = ssid->proto; - bss->conf->wpa_key_mgmt = ssid->key_mgmt; - - if (wpa_s->conf->sae_groups && - wpa_s->conf->sae_groups[0] > 0) { - wpas_mesh_copy_groups(bss, wpa_s); - } else { - bss->conf->sae_groups = - os_memdup(default_groups, - sizeof(default_groups)); - if (!bss->conf->sae_groups) - goto out_free; - } - - len = os_strlen(password); - bss->conf->ssid.wpa_passphrase = - dup_binstr(password, len); - - wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); - if (!wpa_s->mesh_rsn) - goto out_free; - } + if (wpas_mesh_init_rsn(wpa_s)) + goto out_free; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 2e2f3cf..9952102 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -22,6 +22,7 @@ int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr, int duration); void wpas_join_mesh(struct wpa_supplicant *wpa_s); +int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH