From owner-svn-src-all@FreeBSD.ORG Sat Apr 12 23:48:03 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 007A07BB; Sat, 12 Apr 2014 23:48:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFB841BB7; Sat, 12 Apr 2014 23:48:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CNm2YY011121; Sat, 12 Apr 2014 23:48:02 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CNm2ZO011120; Sat, 12 Apr 2014 23:48:02 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201404122348.s3CNm2ZO011120@svn.freebsd.org> From: Rui Paulo Date: Sat, 12 Apr 2014 23:48:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r264390 - stable/10/contrib/wpa/src/drivers X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 23:48:03 -0000 Author: rpaulo Date: Sat Apr 12 23:48:02 2014 New Revision: 264390 URL: http://svnweb.freebsd.org/changeset/base/264390 Log: MFC r263925 Enable all cryptocaps because net80211 can do software encryption. Modified: stable/10/contrib/wpa/src/drivers/driver_bsd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/wpa/src/drivers/driver_bsd.c ============================================================================== --- stable/10/contrib/wpa/src/drivers/driver_bsd.c Sat Apr 12 23:40:54 2014 (r264389) +++ stable/10/contrib/wpa/src/drivers/driver_bsd.c Sat Apr 12 23:48:02 2014 (r264390) @@ -1446,6 +1446,17 @@ static int wpa_driver_bsd_capa(struct bs 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 | WPA_DRIVER_CAPA_ENC_WEP104; @@ -1453,6 +1464,7 @@ static int wpa_driver_bsd_capa(struct bs 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;