From nobody Thu May 09 00:49:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VZYLv0cYcz5K5QR; Thu, 09 May 2024 00:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VZYLt6tSdz4mhN; Thu, 9 May 2024 00:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715215783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awBY8O1L7LDK/PldL3ai/X/RccAMV8ESlBmPui9BNR8=; b=fPpe1gZYSUR0wdz1g+LaFAUJYg5GqwWmmOZKj4u2qeUF/1YYevG1xGnHh9Vx6ptrP/aLBt U0ZfRRGoV3eoACYECD4ZUJJbl9XP9GFAa1HD7hQBgJmqPiiEYUUTPE/o2P0gjqYX7pAYjn 82RRccQEceuxirpn6g838BOftaXvcg0/Om69vijnzsPz4uJAxC889wwexWbi7Vb8R4XLoC 9x6cTNuRMNAuGqdYTY7inrSzw4TE6nnxdkTkqUA/bHOy3z16pirBBKf/O/A+3t5UiXqx4L sAveWxICsPGYQbl80oATX9lwQ0oUc+derScdXMqq3ZmNwdK/opTXPfxdfObxuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715215783; a=rsa-sha256; cv=none; b=Ca5NNdZU/AZ86nOCDNf60JdfriXV/M9wQX8DKoELf1Lq17r5vEA/YxV1dlMIBrNlECnAP5 +dpF9tyzz6NuQD+4HODlu/0GDRfZ2f7ELbLMWU0dEB8xdELoG6PB/7SJvFQ+TDFULzn01N Q/hSgG5ODcOs2RgRbX5Fwe2jG0nT1zWsHGbWXcQDb808J0SzmPYCW8ePmE1pHQP5SugAK2 l/r52CL8B3LO6UdgPnbrhm1U8VDv7H7Lcjx8FedkYkRZPQ4Lcp8NU8AJuaorU4aUywowtr c/afu+tnh1qbb6+/oG+ByyDyZ9DwmBG7jx2Z2f16zTpB2p6o6JaeKxMgnnluwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715215783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awBY8O1L7LDK/PldL3ai/X/RccAMV8ESlBmPui9BNR8=; b=klizPFtG0wdCT2qAh5SfHtxGZ4rJWGXHvvJjWpDQTfhmqYarU+vCKPz94jgc6v17Hb94g+ QIYFxFeLohO43ZQXID6XMoOyaRPyljLB1CbdD0EAWDvIPnQkudZdyeaiyTDeN/jwtqaWql x1ifFkRdeHOT9l0/Ex3beYeMb8baOpnygaDWGR9p1lmluEXqtrZ5i7hGj89kTbwXdEYHWt Np+rSVTshOilXaCcM2lor43U9fSTODXHj6/nxzCTKF/uHxMEzdy/IUqM7CQV9X/J9WCr56 pP3fpTbxV753kFcsatiNE4lLT0bjh9yJCSQb+fZGs2jcl7QngulwcC23kvV56Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VZYLt691pznKk; Thu, 9 May 2024 00:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4490ngfX063600; Thu, 9 May 2024 00:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4490ngWe063597; Thu, 9 May 2024 00:49:42 GMT (envelope-from git) Date: Thu, 9 May 2024 00:49:42 GMT Message-Id: <202405090049.4490ngWe063597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 491938d7435f - main - wpa: Remove the now not-needed local logic to hard-code cipher support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 491938d7435f6a1ee7b6e5a669a72e4c12bd7d2b Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=491938d7435f6a1ee7b6e5a669a72e4c12bd7d2b commit 491938d7435f6a1ee7b6e5a669a72e4c12bd7d2b Author: Adrian Chadd AuthorDate: 2024-04-17 01:55:28 +0000 Commit: Adrian Chadd CommitDate: 2024-05-09 00:48:58 +0000 wpa: Remove the now not-needed local logic to hard-code cipher support A previous commit now exposes the supported net80211 ciphers for the given NIC, rather than the hardware cipher list. This is going to be especially important moving forward when we add more cipher and key management support. Differential Revision: https://reviews.freebsd.org/D44821 --- contrib/wpa/src/drivers/driver_bsd.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index d5ff51cee456..14c19eb1246c 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1557,17 +1557,6 @@ static int wpa_driver_bsd_capa(struct bsd_driver_data *drv) if (devcaps.dc_drivercaps & IEEE80211_C_WPA2) drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA2 | WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK; -#ifdef __FreeBSD__ - drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 | - WPA_DRIVER_CAPA_ENC_WEP104 | - WPA_DRIVER_CAPA_ENC_TKIP | - WPA_DRIVER_CAPA_ENC_CCMP; -#else - /* - * XXX - * FreeBSD exports hardware cryptocaps. These have no meaning for wpa - * since net80211 performs software crypto. - */ if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_WEP) drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 | @@ -1576,7 +1565,6 @@ static int wpa_driver_bsd_capa(struct bsd_driver_data *drv) drv->capa.enc |= WPA_DRIVER_CAPA_ENC_TKIP; if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_CCM) drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP; -#endif if (devcaps.dc_drivercaps & IEEE80211_C_HOSTAP) drv->capa.flags |= WPA_DRIVER_FLAGS_AP;