From patchwork Mon Aug 27 21:28:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962653 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="h6jBjmIs"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="n/4fG4E8"; 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 41zlVc31N8z9s47 for ; Tue, 28 Aug 2018 07:33:12 +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=LBzMSZRpjIxaFVX9hg493pZAWHCEMKmr2+HGy3YyYDQ=; b=h6jBjmIsGZ5iEg SLnPSof0mdHpk3rdTv30WSkpZJd+VxKOlhkIgyrez7nxhIqVh7zlPXmazQ1mKYXiwyamC5b9025Yk g534kosxLhoIabSOgbkcGVq2W5yGqFI2h3edSW28HutgV8RVD1zAcYBVD4trNQL0p4Ssm+CAEpTWX HX0TNKjcqMqgOwAvy1ZIIguSvWVUndFx/vduI1ZaVNl2hjNKFdBYXT0ky/p+qMgIbujpdbWR8B8bu BVIhq51/60lb58Ebe2zhLvwlvraLpMPpxxNszJmPSnn5SyqiBwOIyviJZvts5X8+n8rwXKy0oiw0k qF6Q5uDZzoZT3wvVSlbA==; 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 1fuP86-0000yG-LK; Mon, 27 Aug 2018 21:32:58 +0000 Received: from mail-eopbgr50059.outbound.protection.outlook.com ([40.107.5.59] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4h-0006Rn-M8 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:30 +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:X-MS-Exchange-SenderADCheck; bh=ub77/SJ6C6IACDIOFudcBBVvcKfRr2iuRKauzsqyu6Y=; b=n/4fG4E8H7ED86Qg0wa8xww8d8INkeb4GTHRAhdNn3idg+owZjx5oaVBwhGFbu/NR58y0dyo/ScpvklWolT0RE+b+7LSSdg/CHhXz32WksmN8UhVzp2Diryi4Nu1i6lHFOawSYPddB8VEl/69q+Dz2+BZ8BQ0uTIe3QZfx6X06E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:02 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 02/16] mesh: factor out rsn initialization Date: Mon, 27 Aug 2018 14:28:35 -0700 Message-Id: <04ee619c23bbd7585469d656c00677fc376c2b8c.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88e435a3-5a07-4aa8-6c6e-08d60c641c50 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:6puV6uZ6h88/xkMFjUabTVsy5ofmRbjO25nPJnf0VsOo0F2JX/sTt7TJUDw+8d3dzFeTFZ4986cyWYrB+OIl7hOAVtDW6jeCJ8nlcr/mlDWow1udjVOaUOEb7opy2e9szKSZ/3Sy44aKyRKLWBoCsCiRHlMp0eH05uzDY6LywmOzAuYyHGeMokjHKeUZqeoKMshZhSmAerQySuzDdJHjnzu4ygbvtw3aN8PdVTUpIj2Z56T96X0LI4B+7LgsocwT; 25:pVQzgSKflCQEY6CFkF2ngd7G/FHJlWExuqbvKCsJid+vXG1CxC3vf1Eiuk0EVpC/zsHcGHgMQWeI5PIKxL2wQe22xyPFEaBIaOQLDm6Ah6qAEC4Bh6dP+v8W8TT/pJPVY0fAty3tlJsF+VHdUgoeo67t6xjQ8zF7WdktJrrYSRSO/q0lHDEjGj3JBfavj5jhjdpwHsb/O/pJlp4KbHQN9aoa4o4jRd4edRkfYxC7L6b/Vc2tDzhG/Wz6F5wh8/PE53WfBE5I138rCQWuh6JFFP2UkE47ElPtSg7JcdFJC/x/Q3n1bqRJ9w7u9g/AS0H+00HjexaVXIS+JYbXkAafsw==; 31:cAqRHP4FN6bfh/LGnJ0s8fHGmJ5Fog1fkaQSjlsuC3T8ictaIdzhGxrpT/SXvIT7BwlyyvSLDuP97+MMH6SIYPzMBi3nyhIK13Sa+mYfOm8za/sH7uvuZGmXpw6lR+DisdyByUsWhC4AWTpuZE/qRpLl60nXV7sMvhrje0DvQOBrOSif2m2vYxQpKIZOPKXmYIQ5ajwoGCfP5k6Vuxpa0VMGgtZuzOBhFRwSoAuB4Kk= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:VfrmBkWFkOBv3YFUonFX+BDyBvJQdVQSAltGqqWuqVO6qSMxUcaMdRkAGFIEulccaUoZ8wEeb5xHWumJqM+PRf5P/AzDWv0PjV+VQPEvMvmuTZoJTeJxTERvjKVuNt9s8YsbirNcs5qbhP5g+RLQcdkgn0cbdg9eh0aIjlNqzNEqEKr3E0oWm4c/q/9KwX8LQNVXYc2IVyNiLzJAB87aFM9TVxz5y0Xew+sfg3r/LQrjf/3k9uz5Ww7v0Ai8lQw6P3deAD2STLiyURJZ66cjy9teacCMy3Dr1CXHdcVZlogQqow8f7IxEKr0YPWtUTPfrbVK328wU2Qyy71i6UWVQgTg4t+7GrkVrrS97t8QuAj5U3KmCIQVJx1M5ixUmT8L0v1n+5Se1RU3R4mUKsUNOTKBCtIt6xeqae12E235VWxD0m7/UPe0DA5Z4Oqp/tvF5/GlNnV6oo3CJADFNbR/OivbbYJOvGCe+3tSAAa8jpRMiSQB7ZjbWWkmq0kumQ8u; 4:fJ/VB10O4brrZUPdesxgETGAPAPpiLcIOMf6mOjvlYJ9w84KNy1Q4ptLFGvBXhSLSH6W7w2t9vYh9l1Id6gaHOGF652fKCR98KpNdeCdvtXCxouHj2M05xfbmI9b1eogC1beuPRyfznEUBw5jyMEPPt3MJ0tXUpu4p05EOhYs85pstEZjisAhPKrtcbqrO90SsxVhqB0/ZoQ5QCgQHmDcjvtEBxYK4YT/xPADCkL1pLG/+XxVs1GtjDbIcYual5FNJEGqgBQQo6VWgTJTajPe6ftscKaryg8aL09O+psBV4mNW1ag4AtgTpcd9rvScGo X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(551544002)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR04MB4151; 23:3qSfIJRSFOXV9jePyXH3VEugFnpmBX90AqzkdfZsW?= 2WAidkQzcq6PP1uZq+1aMTJ0pjwEI170pJrxnfWcxBK8ilI+A6Rl0oFO6IT2YncSH+KnRBNtjSfQtYDVPZeIQvSGlYO9LSbwO2piUtcmHZL8eGIoE0d0V/bA7G2LjkY9zAHomNzmlPdzpPtEVw7vdKU/fXnLAHMvZZmWEUc89Je43qVUZmDxLNSClSLvxO4ulcFtijZixHo3O2t8lndUkn7bY9arhzi5+tm6oFiAacrSgmFfmHki2g8incWMuoDuvinIehV054FwK+nFpsOZIuMaky5ljQBB1ZNCFN4qO3wOzP//tkrwxDhP7AUQgcVz7wTawHaMa8yN/N4nGKyAIycDJsPc/fnflfXcH/P7BsHHeomIUaAuRRtdgMq8x85Ig83wP87UyGjUip+kVJHMXXXcZhx9XNqbp/YXHx4u8th3kSCN2ojQ6B33jWr3QbDOWHP4YL8090oe949/DrTfx6dkYHjm6XWXtJJkqqVc7TRcrEgoFRA2e1jA4wtqWGOgTbTA5+NtNShb8ong7fgihDx3vvsOTG8qK/8Jl+hgU1huBtljc4SpkORTpa1Gf8F2rUhHcaRLLKpG+JoE7QONtL+mKlq8GKcp0wmdkYLbQKAfcA97JzSIflwF5i7Rvrd1pQAoT9LwsIRbopHr92bntVFYDkEZs0pgT9P0ZgVvhXnt6lCU8vI8L9RXLqIxlFL2vGS0LPEo/PY1j3STns7QlZdBCxfaSbFwgbWxJcRr2CK1aR3cE8++jTG8O7nUSRuBf1WeCvX96ScCGGOMYsNNXrPJFKi1R8pHZhPl0UP9U/pidiOWDiyQUG6GzB2B7ahayo/uMwMfccS1dwvdLY1FncWcBdW5X+z4pKFhgrV37k7zyZg1P6i9Dvglc7AB9i+q3eLXzRw2sOWY8XkekAQrTepehDpUF2/LaeJpe9wqErxCP8hNpSx3vIQVeD6xD1toBcwIWgoWvojv7BET7A08dwcEnW//JV2LJbeVVO1nCLv/FmsurhqqBudFY4nU35TgSuDb2xegy6FO1XX4/po64u0ql+oBnEtcvn4nR8Ygz04pDYUYXR9WsfUSEjPfxZIS9Yd565tc/DPj6uvR8VkYn+h01u8yp3+qAkAkQGtpF4onSwAhokDYtE2GQe9NM+AgC3GyNKnodnxRLg/B0Z4noVMOQ7zj4UPgykEcCrhiixBiarh5/xeefoJobcKAU8mjZy1+7axSVhmimZW+fpHkKkhe0Wfz5aDu5dr1wWE8SX5ySrr/CYzDvdCHgThBcA5w+zsE7OqlzseA8N+MwrM7o1tcyWGmdctnarim6/Xde8YFi0NlUWxPYWi9Y2IhKTnsDAG8dJLe1wVB150N2X/hqIR X-Microsoft-Antispam-Message-Info: aY0vGWEgQEfZw7WPMN2iyTuloqDJvcfn1Gm5QpFU6JWfqgkeG2Zo35lry6Iq3Kxqzm469Pi2c7TCu6FsOfE7vZSRxjmwUjfRgRC8Al5j64SEXEvPguO60UkhbKmBYURsEdECx756faK75k0Koher9tgNoDweuPa3DNN3zvKtRsEhzwLe2jZOuKv97jYgQmoTjkfRhiDCvby3RaWFxNxe6BRK+wHjha4z8cfAydjizgb81VQwGJT3L39fbHSa9kObvDS3cyvZXklV9hDtf3J7H5coMcPF1JGcuQxYg/G+gB6KQhYk8W4sun6oL278fsKW7JFOxTZLEEPaQ70fm0kH7HxasEZTopVXGTRVkUjUv1M= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:kpTrB6GhQ++eOCyJBzH0IhEAyjXiQBuAJ7uBNPKB29aikwI4dG7sWoYjhwjusen15lCWXjZuG9RVpP94SgTP8oWA4JgKkkjEiti+W9Jl4FElzW7FCqIpgXjY78/p27CbmmcbAmGfLOUp3f64cqDi7+nyJav+5qlW8fopEZWL2vf03IxhM6Fza6eAAfO8P1di9jY19d7eUqFoc+KD2AoJUzYuG29+uR4dwD1f/uzAFM4TGqM5Gl7zwm0xH/0BEHMIs+v/5fyxPfc4ejMeAd+8s+LrYUg3Cs8B/pYFIVl3zCBj2Myo/JZH/Re2/1wCWt+G2Tugs2Ecv9/M6pT/oyjuRR8Be31d6riimyrYfpktCn1c8/izXtE0sxWDJ1jPHSGDepZO9KjSBJriJ8yXeN3QbgdAakvt7uqutEDP5kXEOLuXwhWyoPI6DWwhrnw+XDsCDuc+/RPhax9XxCImAq9iBA==; 5:OO2TaOyWHBlJ35CpxKHA9vYrMookGzsyWR1hk1llTTexBqtGEABSwithXvjH85QMYonMQACCIkS4rB4bZdvdOcnLeLkO2vkDXhnVJTtjNRceEGNe7IakFXpowIB3V8+a46LUFX+EtNaAT95Vax1oxQBg8Fsl/13el08sO7kFwuA=; 7:3vWkQCSBM09j0QDK9AiEtjoQNbYHgm9qNHYcgaDR/4imWErcghIBqBpO5RXucl6a5b9mBT5JOxjnnrMo84AsyQjxInACFAFSAPVfbRe6+UJ6i7/5GIxaDM2KIDSmD+DOuK5eQFPOkrM14OhWvvfbK6++BmIsraDfAGBmsEWW3iAPLmH/7YdQ9RCmOPHSTcau2OCGsx0mXVeJxXHI4NQ6+mP7QJlNs0sXYWw+M2F2WHd1pMIMuAS5Kche82P2MOKB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:02.3704 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88e435a3-5a07-4aa8-6c6e-08d60c641c50 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142927_938109_2CA21F41 X-CRM114-Status: GOOD ( 11.31 ) 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 [40.107.5.59 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 9bbff4c..d126087 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -149,6 +149,53 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +static 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 void wpas_mesh_complete_cb(void *ctx) { struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; @@ -193,9 +240,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; @@ -329,38 +373,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);