svn commit: r264390 - stable/10/contrib/wpa/src/drivers

[Rui Paulo]

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;