From patchwork Mon Mar 6 09:34:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 735649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3vcF8x6s2bz9sNJ for ; Mon, 6 Mar 2017 20:38:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ueZkLVyP"; dkim-atps=neutral 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=5dViCT7+I+QQ2XRtal5ZMuvR91uZK7WRUTJWFh7zXPA=; b=ueZ kLVyPeJpAWVdR7AOYKidNGbQlGFF7BNfrviR541u4akCR42ry91gMvGgvpWOjf9EzstgtsEEdCe// DpyFB9DCgXxu0Xzzj6bzNZBlEefzrZTMcqhUb93Pm3qkLptE6iVRqoO2Bk4HSUS2gZwrVS+LW+eSC lx0NIPDlgC8bF8jc71Xgb2louBFVX/SFySX1zkBP2KH3vdYejeIDtQHAJ4VIUXTSb0wLSEKAFFjyd ZtsrwI6eeRjwFTzfrAInn+L7oO9LDz8Y0R5fRen6jVdWAqYluzhse2AUrKIvJNvCmgGTDUQBSXQZ2 62fi+EFHtwvGW3Qmoc0rhmkIM89cbkA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ckp5b-0001fv-Qg; Mon, 06 Mar 2017 09:37:59 +0000 Received: from mga06.intel.com ([134.134.136.31]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ckp4H-000112-DC for hostap@lists.infradead.org; Mon, 06 Mar 2017 09:36:38 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP; 06 Mar 2017 01:36:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.35,252,1484035200"; d="scan'208"; a="1138431559" Received: from unknown (HELO TEMPHOSTNAME.ger.corp.intel.com) ([10.12.217.219]) by fmsmga002.fm.intel.com with ESMTP; 06 Mar 2017 01:36:13 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Subject: [RFC 3/3] driver_nl80211: Add API to set the PMK to the driver Date: Mon, 6 Mar 2017 11:34:22 +0200 Message-Id: <1488792862-23326-4-git-send-email-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170306_013637_506328_2BBF1FD9 X-CRM114-Status: GOOD ( 11.98 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.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 [134.134.136.31 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -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.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, arend.vanspriel@broadcom.com, johannes@sipsolutions.net, Avraham Stern MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Avraham Stern Add support for setting the PMK to the driver. This is used for drivers that support 4 Way handshake offload. Signed-off-by: Avraham Stern --- src/drivers/driver_nl80211.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 9603397..72819dd 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -2751,6 +2751,40 @@ static int issue_key_mgmt_set_key(struct wpa_driver_nl80211_data *drv, } #endif /* CONFIG_DRIVER_NL80211_QCA */ +static int wpa_driver_nl80211_set_pmk(struct wpa_driver_nl80211_data *drv, + const u8 *key, size_t key_len, + const u8 *addr) +{ + struct nl_msg *msg = NULL; + int ret; + + /* + * If the authenticator address is not set, assume it is + * the current BSSID. + */ + if (!addr && drv->associated) + addr = drv->bssid; + else if (!addr) + return -1; + + msg = nl80211_drv_msg(drv, 0, NL80211_CMD_SET_PMK); + if (!msg || + nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) || + nla_put(msg, NL80211_ATTR_PMK, key_len, key)) { + nl80211_nlmsg_clear(msg); + nlmsg_free(msg); + return -ENOBUFS; + } + + ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1); + if (ret) { + wpa_printf(MSG_DEBUG, + "nl80211: Set PMK failed: ret=%d (%s)", + ret, strerror(-ret)); + } + + return ret; +} static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss, enum wpa_alg alg, const u8 *addr, @@ -2790,6 +2824,10 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss, } #endif /* CONFIG_DRIVER_NL80211_QCA */ + if (alg == WPA_ALG_PMK && + (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE)) + return wpa_driver_nl80211_set_pmk(drv, key, key_len, addr); + if (alg == WPA_ALG_NONE) { msg = nl80211_ifindex_msg(drv, ifindex, 0, NL80211_CMD_DEL_KEY); if (!msg)